Fix lint errors and warnings
Merge pull request #5 from daytonn/fix-lint-errors

Fix lint errors and warnings