Checkpoint of refactoring