Fix linting errors
Merge pull request #953 from nibalizer/fix_lint

Fix linting errors