Refactoring of View