Lint <3
More lint fixes.
Merge pull request #6 from imalberto/fix-lint

Lint fixes