soe refactorings