minor linting and tidy up