changes after refactorings