REFACTOR: simplify redirect