final refactoring of views