Preaching MVC. Little modifications2