simplify code
update date format