refactoring

tidying up