Minor edits and refactoring.

Signed-off-by: Henry J. Wylde <accounts+git@hjwylde.com>