Tidying up refactoring.