Fix lint issues
Merge pull request #623 from muffinresearch/fix-lint-violations

Fix lint issues