Small cosmetic cleanups