CLC-1648 Format times more reasonably