In-class refactor.

My text editor removed extraneous whitespace.

I chose a few improved names.
Merge pull request #1 from brookr/master

In-class refactor.