more time format cleanups