integration refactoring

any suggestions ?