cleaned up how time is shown