Refactoring Controller logic out of Routers