Formatting cleanup
Fixed a few mistakes