linting and general clean-up