View refactoring step I