Addressed linting issues