Tidying up and refactoring