Slight view refactor