Added better linting support