Refactoring
Implement View and Controller