Refactoring and redirection.