code cleanup and use only one router
update the date values