a few minor cleanups