started tidying codebase a little