- minor cleanups