continue with refactor