checkout refactoring continues