Merge pull request #491 from mhaskel/lint_cleanup