Linting and extra comments