Refactoring ExerciseActivity step 1