minor cleanups
more cleanups