Make some suggested cleanup changes.
Minor cleanups.

* Use (</>) where appropriate.
* Naming and formatting.