bunch of minor cleanups