Simplify redirect handling