In-class refactor.

My text editor removed extraneous whitespace.

I chose a few improved names.