Code Cleanup

Automatically detected a bunch of lazy coding, and modified it all
manually, to make sure that nothing would be screwed up because of it.
Everything looks so pretty, now. <3