some more cleaning up of hard coded date formats