Formatting

Partial formatting update