clean up
working on parsing the date