Cleaned up a lot of old sloppiness from previous versions of the app