More cleaning up date formatting