code reviews from #12 and #19

just tests, dead code, and var renames