Some tidy up and refactoring