Minor: simplified one section where a test was done repeatedly when it could be done just once at the top of the section.
Readability: removed some unneeded if statements.
Cleanup: removed some unused variables.
Merge branch 'master' of https://github.com/NAVADMC/SpreadModel
Merge branch 'master' of https://github.com/NAVADMC/SpreadModel
Merge branch 'master' of https://github.com/NAVADMC/SpreadModel