diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run
index ff0668e5..4d8e2321 100755
--- a/bin/cdist-object-explorer-run
+++ b/bin/cdist-object-explorer-run
@@ -32,7 +32,6 @@ __cdist_object="$1"; shift
 __object_id="$(__cdist_object_id_from_object "$__cdist_object")"
 __cdist_type="$(__cdist_type_from_object "$__cdist_object")"
 
-
 # Check if type of object has >= 1 explorer
 __cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
 # Run the type explorers for the current object if any
@@ -47,8 +46,8 @@ if [ "$__cdist_has_explorer" ]; then
 
    echo "Running explorers for $__cdist_object ..."
    # Copy object parameters
-   cdist-dir push "$__cdist_target_host"                       \
-      "$(__cdist_object_parameter_dir "$__cdist_object")"            \
+   cdist-dir push "$__cdist_target_host"                          \
+      "$(__cdist_object_parameter_dir "$__cdist_object")"         \
       "$(__cdist_remote_object_parameter_dir "$__cdist_object")"
 
    # Execute explorers
@@ -62,7 +61,7 @@ if [ "$__cdist_has_explorer" ]; then
       "$(__cdist_remote_object_type_explorer_dir "$__cdist_object")"
 
    # Copy back results
-   cdist-dir pull "$__cdist_target_host"                       \
+   cdist-dir pull "$__cdist_target_host"                             \
       "$(__cdist_remote_object_type_explorer_dir "$__cdist_object")" \
       "$(__cdist_object_type_explorer_dir "$__cdist_object")"
 fi
diff --git a/bin/cdist-object-gencode-run b/bin/cdist-object-gencode-run
index bfc65730..4d21fec9 100755
--- a/bin/cdist-object-gencode-run
+++ b/bin/cdist-object-gencode-run
@@ -29,15 +29,15 @@ set -eu
 __cdist_target_host="$1"; shift
 __cdist_object="$1"; shift
 
-code_local="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_local}"
-code_remote="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_remote}"
+__cdist_code_local="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_local}"
+__cdist_code_remote="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_remote}"
 
 echo "Generating local code for $__cdist_object ..."
 cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
-   "${__cdist_name_gencode_local}" > "${code_local}"
+   "${__cdist_name_gencode_local}" > "${__cdist_code_local}"
 
 echo "Generating remote code for $__cdist_object ..."
 cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
-   "${__cdist_name_gencode_remote}" > "${code_remote}"
+   "${__cdist_name_gencode_remote}" > "${__cdist_code_remote}"
 
-chmod u+x "${code_local}" "${code_remote}"
+chmod u+x "${__cdist_code_local}" "${__cdist_code_remote}"
diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME
index 7807c9e0..4dc5b53b 100644
--- a/doc/dev/todo/TAKEME
+++ b/doc/dev/todo/TAKEME
@@ -14,6 +14,9 @@ CORE
    cdist-deploy-to: more dependency of cdist-manifest-run, but a lot of
    less cycles consumed
 
+- cdist-object-gencode: remove code if output empty?
+   - also take care of that in cdist-code-run!
+
 TYPES
 ------
 Types to be written/extended: