minor cleanups from discussion