cosmetic cleanups