Refactoring views and objects