just minor cleanups