Refactor a bit, add fix MVC.