diff --git a/manifests/client/install.pp b/manifests/client/install.pp
index 8aed6ac..3c4ce18 100644
--- a/manifests/client/install.pp
+++ b/manifests/client/install.pp
@@ -9,23 +9,18 @@ class xymon::client::install {
     logoutput => 'on_failure',
   }
 
-  exec { 'Create download directory for Xymon client package':
-    command => "mkdir -p -- ${xymon::client::download_dir}",
-    creates => $xymon::client::download_dir,
-  }
-  ->
   ## Package
   # Download the latest Xymon client package
   exec { 'Download Xymon Client':
     command => "wget ${xymon::client::preconfig::dl_url}/${xymon::client::preconfig::pkg_name} -O ${xymon::client::preconfig::pkg_name}",
-    cwd     => "${xymon::client::download_dir}",
+    cwd     => $xymon::client::download_dir,
     creates => "${xymon::client::download_dir}/${xymon::client::preconfig::pkg_name}",
   }
   ->
   # Install Xymon client package
   package { 'xymon-client':
-    ensure   => "${xymon::client::pkg_ensure}",
-    provider => "${xymon::client::pkg_provider}",
+    ensure   => $xymon::client::pkg_ensure,
+    provider => $xymon::client::pkg_provider,
     source   => "${xymon::client::download_dir}/${xymon::client::preconfig::pkg_name}",
   }
 
diff --git a/manifests/client/preconfig.pp b/manifests/client/preconfig.pp
index 8b177ac..e67b938 100644
--- a/manifests/client/preconfig.pp
+++ b/manifests/client/preconfig.pp
@@ -33,4 +33,9 @@ class xymon::client::preconfig {
     $pkg_name = $xymon::client::package_name
   }
 
+  exec { 'Create download directory for Xymon client package':
+    command => "mkdir -p -- ${xymon::client::download_dir}",
+    creates => $xymon::client::download_dir,
+  }
+
 } # Private class: xymon::client::preconfig