Checkpoint
Minor cleanup