Lint fixes
Merge pull request #221 from conorfennell/master

Lint fixes