Cleaned up the time formatting