Continue with refactor