Standardize time formatting better