Linting cleanup