Rewrite refactoring exercise for lab 4, and update handin suggestion accordingly