cleanup + linting