Refactoring more than one object