integration refactoring