CF-224 moved view logic into helper