Moved things around
Tidied up
More tidy ups