Minor formatting changes.
Some name-smithing for clarity.