Added better formatting of times