Fix minor smells detected by codeclimate.
Fix typo.
DRY.