minor t/ cleanups