General Cleanup

Up to you if you want to merge this, kinda of neat freak so anything that does not need to be there shouldn't