Finally fixed time formatting