Refactor controller
Refactor buoihoc