minor cleanups #2