Further linting