Refactor in Views