integration refactoring

yhea, I'll remove it.