Checkpoint for misc refactorings