Linting refactor