some cosmetic cleanups