Views refactoring.