- Refactor Controller
- Passed unit tests