REFACTORING - MVC