sorted linting issues