From 04f657327db467574d13682b25e2a9c9f6f62d28 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 14 Oct 2022 14:19:02 +0200
Subject: [PATCH] resolve: code improvements

---
 openpype/hosts/resolve/api/__init__.py        | 7 +++----
 openpype/hosts/resolve/api/preload_console.py | 2 +-
 openpype/hosts/resolve/utils.py               | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/resolve/api/__init__.py b/openpype/hosts/resolve/api/__init__.py
index cf1edb4c35..00a598548e 100644
--- a/openpype/hosts/resolve/api/__init__.py
+++ b/openpype/hosts/resolve/api/__init__.py
@@ -1,10 +1,6 @@
 """
 resolve api
 """
-
-bmdvr = None
-bmdvf = None
-
 from .utils import (
     get_resolve_module
 )
@@ -70,6 +66,9 @@ from .workio import (
 from .testing_utils import TestGUI
 
 
+bmdvr = None
+bmdvf = None
+
 __all__ = [
     "bmdvr",
     "bmdvf",
diff --git a/openpype/hosts/resolve/api/preload_console.py b/openpype/hosts/resolve/api/preload_console.py
index a822ea2460..8b2b31fe1a 100644
--- a/openpype/hosts/resolve/api/preload_console.py
+++ b/openpype/hosts/resolve/api/preload_console.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import time
-from openpype.hosts.resolve.utils import get_resolve_module
+from openpype.hosts.resolve.api.utils import get_resolve_module
 from openpype.lib import Logger
 
 log = Logger.get_logger(__name__)
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index d5c133bbf5..5881f153ae 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -9,7 +9,8 @@ def setup(env):
     log = Logger.get_logger("ResolveSetup")
     scripts = {}
     us_env = env.get("RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR")
-    us_dir = env.get("RESOLVE_UTILITY_SCRIPTS_DIR", "")
+    us_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
+
     us_paths = [os.path.join(
         RESOLVE_ROOT_DIR,
         "utility_scripts"