Clean up lint warnings
Merge pull request #625 from mhaskel/lint_cleanup

Clean up lint warnings