Revert "Revert "Addressed linter errors""
Merge pull request #8 from aquilax/revert-7-revert-6-hotfix-comments

Revert "Revert "Addressed linter errors""