Refactoring of view