some more minor cleanups