Refactoring helper