Cleaned up a bit activity 5 in student and solution

I cleaned up a bit activity 5 in student and solution. Should only need
fixing when the whole data structure is changed.