Added better time formatting