diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md
index 82a3abfc7..1bd1da4cd 100644
--- a/doc/3-monitoring-basics.md
+++ b/doc/3-monitoring-basics.md
@@ -849,18 +849,18 @@ you can add a `vars` dictionary as shown for the `CheckCommand` object.
       command = [ SysconfDir + "/icinga2/scripts/mail-notification.sh" ]
 
       env = {
-        "NOTIFICATIONTYPE" = "$notification.type$"
-        "SERVICEDESC" = "$service.name$"
-        "HOSTALIAS" = "$host.display_name$",
-        "HOSTADDRESS" = "$address$",
-        "SERVICESTATE" = "$service.state$",
-        "LONGDATETIME" = "$icinga.long_date_time$",
-        "SERVICEOUTPUT" = "$service.output$",
-        "NOTIFICATIONAUTHORNAME" = "$notification.author$",
-        "NOTIFICATIONCOMMENT" = "$notification.comment$",
-    	"HOSTDISPLAYNAME" = "$host.display_name$",
-        "SERVICEDISPLAYNAME" = "$service.display_name$",
-        "USEREMAIL" = "$user.email$"
+        NOTIFICATIONTYPE = "$notification.type$"
+        SERVICEDESC = "$service.name$"
+        HOSTALIAS = "$host.display_name$"
+        HOSTADDRESS = "$address$"
+        SERVICESTATE = "$service.state$"
+        LONGDATETIME = "$icinga.long_date_time$"
+        SERVICEOUTPUT = "$service.output$"
+        NOTIFICATIONAUTHORNAME = "$notification.author$"
+        NOTIFICATIONCOMMENT = "$notification.comment$"
+    	HOSTDISPLAYNAME = "$host.display_name$"
+        SERVICEDISPLAYNAME = "$service.display_name$"
+        USEREMAIL = "$user.email$"
       }
     }
 
@@ -1032,7 +1032,7 @@ and `nrpe-disk` applied to the `nrpe-server`. The health check is defined as
 
     object Host "nrpe-server" {
       import "generic-host"
-      address = "192.168.1.5",
+      address = "192.168.1.5"
     }
 
     apply Dependency "disable-nrpe-checks" to Service {
diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index aa446880b..57bee14b5 100644
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -251,7 +251,7 @@ Sets a dictionary element to the specified value.
 Example:
 
     {
-      a = 5,
+      a = 5
       a = 7
     }
 
@@ -875,18 +875,18 @@ Example:
       ]
 
       env = {
-        "NOTIFICATIONTYPE" = "$notification.type$"
-        "SERVICEDESC" = "$service.name$"
-        "HOSTALIAS" = "$host.display_name$",
-        "HOSTADDRESS" = "$address$",
-        "SERVICESTATE" = "$service.state$",
-        "LONGDATETIME" = "$icinga.long_date_time$",
-        "SERVICEOUTPUT" = "$service.output$",
-        "NOTIFICATIONAUTHORNAME" = "$notification.author$",
-        "NOTIFICATIONCOMMENT" = "$notification.comment$",
-        "HOSTDISPLAYNAME" = "$host.display_name$",
-        "SERVICEDISPLAYNAME" = "$service.display_name$",
-        "USEREMAIL" = "$user.email$"
+        NOTIFICATIONTYPE = "$notification.type$"
+        SERVICEDESC = "$service.name$"
+        HOSTALIAS = "$host.display_name$"
+        HOSTADDRESS = "$address$"
+        SERVICESTATE = "$service.state$"
+        LONGDATETIME = "$icinga.long_date_time$"
+        SERVICEOUTPUT = "$service.output$"
+        NOTIFICATIONAUTHORNAME = "$notification.author$"
+        NOTIFICATIONCOMMENT = "$notification.comment$"
+        HOSTDISPLAYNAME = "$host.display_name$"
+        SERVICEDISPLAYNAME = "$service.display_name$"
+        USEREMAIL = "$user.email$"
       }
     }
 
diff --git a/etc/icinga2/conf.d/commands.conf b/etc/icinga2/conf.d/commands.conf
index bcecd28a8..f39cfcd53 100644
--- a/etc/icinga2/conf.d/commands.conf
+++ b/etc/icinga2/conf.d/commands.conf
@@ -6,16 +6,16 @@ object NotificationCommand "mail-host-notification" {
   command = [ SysconfDir + "/icinga2/scripts/mail-host-notification.sh" ]
 
   env = {
-    "NOTIFICATIONTYPE" = "$notification.type$"
-    "HOSTALIAS" = "$host.display_name$",
-    "HOSTADDRESS" = "$address$",
-    "HOSTSTATE" = "$host.state$",
-    "LONGDATETIME" = "$icinga.long_date_time$",
-    "HOSTOUTPUT" = "$host.output$",
-    "NOTIFICATIONAUTHORNAME" = "$notification.author$",
-    "NOTIFICATIONCOMMENT" = "$notification.comment$",
-    "HOSTDISPLAYNAME" = "$host.display_name$",
-    "USEREMAIL" = "$user.email$"
+    NOTIFICATIONTYPE = "$notification.type$"
+    HOSTALIAS = "$host.display_name$"
+    HOSTADDRESS = "$address$"
+    HOSTSTATE = "$host.state$"
+    LONGDATETIME = "$icinga.long_date_time$"
+    HOSTOUTPUT = "$host.output$"
+    NOTIFICATIONAUTHORNAME = "$notification.author$"
+    NOTIFICATIONCOMMENT = "$notification.comment$"
+    HOSTDISPLAYNAME = "$host.display_name$"
+    USEREMAIL = "$user.email$"
   }
 }
 
@@ -25,18 +25,18 @@ object NotificationCommand "mail-service-notification" {
   command = [ SysconfDir + "/icinga2/scripts/mail-service-notification.sh" ]
 
   env = {
-    "NOTIFICATIONTYPE" = "$notification.type$"
-    "SERVICEDESC" = "$service.name$"
-    "HOSTALIAS" = "$host.display_name$",
-    "HOSTADDRESS" = "$address$",
-    "SERVICESTATE" = "$service.state$",
-    "LONGDATETIME" = "$icinga.long_date_time$",
-    "SERVICEOUTPUT" = "$service.output$",
-    "NOTIFICATIONAUTHORNAME" = "$notification.author$",
-    "NOTIFICATIONCOMMENT" = "$notification.comment$",
-    "HOSTDISPLAYNAME" = "$host.display_name$",
-    "SERVICEDISPLAYNAME" = "$service.display_name$",
-    "USEREMAIL" = "$user.email$"
+    NOTIFICATIONTYPE = "$notification.type$"
+    SERVICEDESC = "$service.name$"
+    HOSTALIAS = "$host.display_name$"
+    HOSTADDRESS = "$address$"
+    SERVICESTATE = "$service.state$"
+    LONGDATETIME = "$icinga.long_date_time$"
+    SERVICEOUTPUT = "$service.output$"
+    NOTIFICATIONAUTHORNAME = "$notification.author$"
+    NOTIFICATIONCOMMENT = "$notification.comment$"
+    HOSTDISPLAYNAME = "$host.display_name$"
+    SERVICEDISPLAYNAME = "$service.display_name$"
+    USEREMAIL = "$user.email$"
   }
 }
 
diff --git a/etc/icinga2/features-available/debuglog.conf b/etc/icinga2/features-available/debuglog.conf
index 678969076..6e8e5813e 100644
--- a/etc/icinga2/features-available/debuglog.conf
+++ b/etc/icinga2/features-available/debuglog.conf
@@ -5,7 +5,7 @@
  */
 
 object FileLogger "debug-file" {
-  severity = "debug",
+  severity = "debug"
   path = LocalStateDir + "/log/icinga2/debug.log"
 }
 
diff --git a/etc/icinga2/features-available/graphite.conf b/etc/icinga2/features-available/graphite.conf
index b855f9bb1..f2e59d9e8 100644
--- a/etc/icinga2/features-available/graphite.conf
+++ b/etc/icinga2/features-available/graphite.conf
@@ -6,6 +6,6 @@
 library "perfdata"
 
 object GraphiteWriter "graphite" {
-  //host = "127.0.0.1",
+  //host = "127.0.0.1"
   //port = 2003
 }
diff --git a/etc/icinga2/features-available/ido-mysql.conf b/etc/icinga2/features-available/ido-mysql.conf
index b85322f29..beab89f4c 100644
--- a/etc/icinga2/features-available/ido-mysql.conf
+++ b/etc/icinga2/features-available/ido-mysql.conf
@@ -6,8 +6,8 @@
 library "db_ido_mysql"
 
 object IdoMysqlConnection "ido-mysql" {
-  //user = "icinga",
-  //password = "icinga",
-  //host = "localhost",
+  //user = "icinga"
+  //password = "icinga"
+  //host = "localhost"
   //database = "icinga"
 }
diff --git a/etc/icinga2/features-available/ido-pgsql.conf b/etc/icinga2/features-available/ido-pgsql.conf
index c8b8dfd57..2a20afa9a 100644
--- a/etc/icinga2/features-available/ido-pgsql.conf
+++ b/etc/icinga2/features-available/ido-pgsql.conf
@@ -6,8 +6,8 @@
 library "db_ido_pgsql"
 
 object IdoPgsqlConnection "ido-pgsql" {
-  //user = "icinga",
-  //password = "icinga",
-  //host = "localhost",
+  //user = "icinga"
+  //password = "icinga"
+  //host = "localhost"
   //database = "icinga"
 }
diff --git a/etc/icinga2/features-available/mainlog.conf b/etc/icinga2/features-available/mainlog.conf
index 773a0b436..ded9a7c7d 100644
--- a/etc/icinga2/features-available/mainlog.conf
+++ b/etc/icinga2/features-available/mainlog.conf
@@ -3,7 +3,7 @@
  */
 
 object FileLogger "main-log" {
-  severity = "information",
+  severity = "information"
   path = LocalStateDir + "/log/icinga2/icinga2.log"
 }
 
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 03243af67..74dab6a0a 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -117,7 +117,7 @@ object CheckCommand "dummy" {
 		PluginDir + "/check_dummy",
 		"$dummy_state$",
 		"$dummy_text$"
-	],
+	]
 
 	vars.dummy_state = 0
 	vars.dummy_text = "Check was successful."
@@ -492,9 +492,9 @@ object CheckCommand "dns" {
 	command = PluginDir + "/check_dns"
 
 	arguments = {
-		"-H" = "$dns_lookup$",
-		"-s" = "$dns_server$",
-		"-a" = "$dns_expected_answer$",
+		"-H" = "$dns_lookup$"
+		"-s" = "$dns_server$"
+		"-a" = "$dns_expected_answer$"
 		"-A" = {
 			set_if = "$dns_authoritative$"
 		}
@@ -510,8 +510,8 @@ object CheckCommand "dig" {
 	command = PluginDir + "/check_dig"
 
 	arguments = {
-		"-H" = "$dig_server$",
-		"-l" = "$dig_lookup$",
+		"-H" = "$dig_server$"
+		"-l" = "$dig_lookup$"
 	}
 
 	vars.dig_server = "$address$"