Get rid of more bad code, more variables created on Controller needed in Views