Updates to formatting

Integrating suggestions from @davidchambers