Clean up the time formatting