cleanup/linting