integration refactoring

good suggestion, didn't know that