Moving towards correct MVC style.