Misc. linting fixes
Merge pull request #24 from jamtur01/linting

Misc. linting fixes