#redirect Refactoring