Merge pull request #3 from willnorris/lint

fix lint warnings
fix one var rename I overlooked