some minor cleanups