[CHORE] Refactored controllers