Minor refactorings to remove some reek smells.

Includes adding class comments, renaming variables and removing unused
variables.

For issue #231.