Refactor all views