More minor changes and code cleaning
Merge branch 'master' of https://github.com/ZachPeterson/Math2605Project