Tidied up a bunch of crap