Refactoring for controllers
Refactoring for controllers
Improved readability