Formatting improvements

No functional changes, just formatting and typos...