Refactor controller
Modify Error