tidying up codebase