Formatting

Various minor formatting cleanups