Improve format of time