Begin refactoring objects