Router refact