Refactor logic out of view and into decorator (draper)