clean up formatting including dates