fix(NavExercise): code clean up