facility refactoring