fix date and clean