Minor cosmetic cleanups