linting/cleanup