Formatting improvements.
Formatting and minor tweaks