minor cleanups to prev commit