Improve time output