Skip logic refactoring