Refactoring MVC