Cleanups on output and time string