refact Date