A few other formatting cleanups