minor cleanups
cleanup