cleanup
fix date from string