Refactoring: partials and redirects