Addressed linter concerns