diff --git a/bin/cdist-code-run b/bin/cdist-code-run
index db1a2378..54cb312f 100755
--- a/bin/cdist-code-run
+++ b/bin/cdist-code-run
@@ -36,7 +36,6 @@ code="$(__cdist_object_code "$__cdist_object")-${__cdist_gencode_type}"
 
 echo "Checking code-${__cdist_gencode_type} for $__cdist_object ..."
 
-
 if [ -e "$code" ]; then
    if [ -f "$code" ]; then
       if [ -x "$code" ]; then
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index aeae3b6c..02fd34fa 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -18,7 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Apply configuration to a host
+# Deploy configuration to a host
 #
 
 . cdist-config
@@ -45,8 +45,8 @@ __cdist_init_deploy           "$__cdist_target_host"
 
 # Transfer cdist executables
 echo "Transferring cdist binaries to $__cdist_target_host ..."
-cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
-
+cdist-dir push                "$__cdist_target_host" \
+   "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 cdist-explorer-run-global     "$__cdist_target_host"
 cdist-manifest-run-init       "$__cdist_target_host"
 cdist-object-all              "$__cdist_target_host" cdist-object-process
diff --git a/bin/cdist-dir b/bin/cdist-dir
index 72f4730b..0d30e14a 100755
--- a/bin/cdist-dir
+++ b/bin/cdist-dir
@@ -25,14 +25,11 @@
 
 
 . cdist-config
-if [ $# -ne 4 ]; then
-   __cdist_usage "<push|pull> <target host> <src dir> <dst dir>"
-fi
+[ $# -eq 4 ] || __cdist_usage "<push|pull> <target host> <src dir> <dst dir>"
 set -ue
 
 __cdist_action="$1"; shift
 __cdist_target_host="$1"; shift
-
 __cdist_src_dir="$1"; shift
 __cdist_dst_dir="$1"; shift
 
diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME
index e85ddebd..7807c9e0 100644
--- a/doc/dev/todo/TAKEME
+++ b/doc/dev/todo/TAKEME
@@ -10,6 +10,9 @@ CORE
    __cdist_echo [level] [messages...]
       level := syslog alike:
          debug, notice, err
+- Think about moving cdist-type-build-emulation out of cdist-manifest-run to
+   cdist-deploy-to: more dependency of cdist-manifest-run, but a lot of
+   less cycles consumed
 
 TYPES
 ------