Linting and general clean-up