cleaning after refactoring