Tidied up a bunch of code