refactoring; renaming the exercises