Refactoring object