Cleaned up time formatting