Started to refactor view helpers