worked date formay refacting