Cleanup of date formatting