Refactoring checkpoint
Minor changes