Refactoring other controller classes