minor stylistic and ordering changes
Merge branch 'master' of https://github.com/ChristopherTulip/CPSC-312---Project-1