tidying up and linting