Refactor Categories Controller
Refactor Accounts Controller