Clean up Code (2 hours)

[nimmerman]

All of the code needs a look through to reduce duplicate code, increase legibility, and generally enforce good programming practices.