Cleaned up a lot of crap