minor cleanups.