More cosmetic cleanups