#42: refactored ExerciseId