Basic Cleanup

Just some basic cleanup, will continue if you like it.