Refactoring Checkpoint prior to Assignment