more minor cleanups