even more minor cleanups