diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e00a8d..c351ca8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,8 @@
 ##### Features
 
 ##### Changes
-* Correct indentation and README.md.
-* Add a default case in the case statement.
+* Correct warning from Puppet-lint (indentation, default case, string with var).
+* Correct README.md.
 
 ---------------------------------------
 
diff --git a/manifests/install.pp b/manifests/install.pp
index 7f8cdcd..74536a0 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -11,40 +11,40 @@ class dynmotd::install {
   }
 
   # Dynamic Motd folder and scripts
-  file { "${dynmotd::update_motd_dir_path}":
+  file { $dynmotd::update_motd_dir_path:
     ensure => directory,
   }
   ->
   file { "${dynmotd::update_motd_dir_path}/${dynmotd::system_info_script_name}":
     ensure  => present,
-    content => template("${dynmotd::system_info_script_content}"),
+    content => template($dynmotd::system_info_script_content),
   }
   ->
   file { "${dynmotd::update_motd_dir_path}/${dynmotd::user_info_script_name}":
     ensure  => present,
-    content => template("${dynmotd::user_info_script_content}"),
+    content => template($dynmotd::user_info_script_content),
   }
   ->
   file { "${dynmotd::update_motd_dir_path}/${dynmotd::auth_info_script_name}":
     ensure  => present,
-    content => template("${dynmotd::auth_info_script_content}"),
+    content => template($dynmotd::auth_info_script_content),
   }
   ->
   file { "${dynmotd::update_motd_dir_path}/${dynmotd::fs_info_script_name}":
     ensure  => present,
-    content => template("${dynmotd::fs_info_script_content}"),
+    content => template($dynmotd::fs_info_script_content),
   }
   ->
   file { "${dynmotd::update_motd_dir_path}/${dynmotd::service_info_script_name}":
     ensure  => present,
-    content => template("${dynmotd::service_info_script_content}"),
+    content => template($dynmotd::service_info_script_content),
   }
 
   # Static Motd
-  file { "${dynmotd::static_motd_path}":
+  file { $dynmotd::static_motd_path:
     ensure  => present,
-    mode    => 0644,
-    content => template("${dynmotd::static_motd_content}"),
+    mode    => '0644',
+    content => template($dynmotd::static_motd_content),
   }
 
 
diff --git a/manifests/params.pp b/manifests/params.pp
index d9dfca4..e654f5d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -31,7 +31,7 @@ class dynmotd::params {
 
     }
     default: {
-      fail("This Puppet module has been tested only on Debian OS family.")
+      fail('This Puppet module has been tested only on Debian OS family.')
     }
 
   }