refactor account router