diff --git a/tuhi-gui.in b/tuhi-gui.in
index ab1fdcb..69c0709 100755
--- a/tuhi-gui.in
+++ b/tuhi-gui.in
@@ -18,9 +18,11 @@ from gi.repository import Gio
 
 @devel@  # NOQA
 if "TUHI_DEVEL" in os.environ:
-    resource = Gio.resource_load(os.fspath(Path(os.environ["TUHI_DEVEL"], 'data', 'tuhi.gresource')))
+    resource_path = Path(os.environ["TUHI_DEVEL"], 'data', 'tuhi.gresource')
 else:
-    resource = Gio.resource_load(os.fspath(Path('@pkgdatadir@', 'tuhi.gresource')))
+    resource_path = Path('@pkgdatadir@', 'tuhi.gresource')
+    
+ resource = resource = Gio.resource_load(os.fspath(resource_path))
 Gio.Resource._register(resource)
 
 
diff --git a/tuhi.in b/tuhi.in
index c6c17f2..77e8bc7 100755
--- a/tuhi.in
+++ b/tuhi.in
@@ -17,12 +17,8 @@ import subprocess
 from pathlib import Path
 import argparse
 
-if "TUHI_DEVEL" in os.environ:
-    tuhi_server = Path(os.environ["TUHI_DEVEL"], 'tuhi-server')
-    tuhi_gui = Path(os.environ["TUHI_DEVEL"], 'tuhi-gui')
-else:
-    tuhi_server = Path('@libexecdir@', 'tuhi-server')
-    tuhi_gui = Path('@libexecdir@', 'tuhi-gui')
+tuhi_server = Path(os.environ.get("TUHI_DEVEL", "@libexecdir@"), 'tuhi-server')
+tuhi_gui = Path(os.environ.get("TUHI_DEVEL", "@libexecdir@"), 'tuhi-gui')
 
 
 @devel@  # NOQA