Improved MVC. Refactoring.