fix refactorings