Refactoring for component