views refactor