Formatting cleanup

Cleaning up the formatting, etc.