slight view refactor