Post-exercise refactoring