Composition Refactoring