Major General Cleanup #2

PyCharm is the greatest thing in the world.
More indentations and some general layout stuff.