Var name fixes for Reek.
remove nil check
Documentation comments for subclasses
Merge pull request #40 from Dapperbot/reek-kaku

Kaku's reek work