Small changes to the structure and solution to 3.5.(a-c)

see commits for change info.