View + refactoring