Applied even more strict linting