Refactor mark skipping
3 files changed