SubversesController refactoring