Fix lint issues
Merge pull request #12 from mhaskel/lint_cleanup

Fix lint issues