Clean up and fix crap