continue with refactoring