Better format time maybe?