diff --git a/Templates/controller.pm.tem b/Templates/controller.pm.tem
index 993a596..d3825f2 100644
--- a/Templates/controller.pm.tem
+++ b/Templates/controller.pm.tem
@@ -70,11 +70,11 @@ sub main {
     $c->app->log->info( $c->log_req );
 
 	#The most common ones
-	 $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-	 $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-	 $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-	 $hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
-	 $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+	 $cdb = esmith::ConfigDB->open()   || die('Couldn't open config db');
+	 $adb = esmith::AccountsDB->open() || die('Couldn't open Accounts db');
+	 $ndb = esmith::NetworksDB->open() || die('Couldn't open Network db');
+	 $hdb = esmith::HostsDB->open() 	  || die('Couldn't open Hosts db');
+	 $ddb = esmith::DomainsDB->open()  || die('Couldn't open Domains db');
 
      %${prefix}_data = ();
     my $title = $c->l('${prefix}_${MenuDescription}');
@@ -86,7 +86,7 @@ sub main {
     # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
     my $db = $$${controldb | db | 'cdb'}; #pickup local or global db or Default to config
     <tal:block tal:repeat="dbfield dbfields">
-		$$${prefix}_data{'${dbfield}'} = $db->prop('${dbfield}') || ${dbdefault | ""} || "";
+		$$${prefix}_data{'${dbfield}'} = $db->prop('${dbfield}') || ${dbdefault | ''} || '';
 	</tal:block>
 	
 	$c->do_display($$${prefix}_data{'trt'});
@@ -107,7 +107,7 @@ sub do_update {
 	#render back to current panel with error message in stash
 #otherwise:
 	#By panel (series of if statements - only one executed):
-		#do whatever is required: call perform-PANEL() - return "ok" or Error Message
+		#do whatever is required: call perform-PANEL() - return 'ok' or Error Message
 			#call signal-event for any global actions specified (check it exists - error and continue?)
 			#if action smeserver-<whatever>-update exists
 				#signal_event smeserver-<whatever>-update
@@ -124,11 +124,11 @@ sub do_update {
 	my $modul = '';
 
 	#The most common ones - you might want to comment out any not used.
-	$cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-	$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-	$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-	$hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
-	$ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+	$cdb = esmith::ConfigDB->open()   || die('Couldn't open config db');
+	$adb = esmith::AccountsDB->open() || die('Couldn't open Accounts db');
+	$ndb = esmith::NetworksDB->open() || die('Couldn't open Network db');
+	$hdb = esmith::HostsDB->open() 	  || die('Couldn't open Hosts db');
+	$ddb = esmith::DomainsDB->open()  || die('Couldn't open Domains db');
 
     my $title = $c->l('${prefix}_${MenuDescription}');
 
@@ -156,7 +156,7 @@ sub do_update {
 			$thispanel = '${panel}';
 		}
 	</tal:block>
-	if ($ret ne "ok"){
+	if ($ret ne 'ok'){
 		$c->stash(error => $c->l($ret));
 		$c->do_display($thispanel);
 	} else {
@@ -166,7 +166,7 @@ sub do_update {
 			if ($trt eq '${panel}'){
 				#do whatever is required ...
 				$ret = $c->perform_${panel}(\%${prefix}_data);
-				if ($ret ne "ok") {
+				if ($ret ne 'ok') {
 					# return to the panel with error message
 					$c->stash(error => $c->l($ret));
 					$c->stash( 
@@ -208,14 +208,14 @@ sub do_display {
     $c->app->log->info($c->log_req);
 
 	#The most common ones - you might want to comment out any not used.
-	$cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
-	$adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
-	$ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
-	$hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
-	$ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+	$cdb = esmith::ConfigDB->open()   || die('Couldn't open config db');
+	$adb = esmith::AccountsDB->open() || die('Couldn't open Accounts db');
+	$ndb = esmith::NetworksDB->open() || die('Couldn't open Network db');
+	$hdb = esmith::HostsDB->open() 	  || die('Couldn't open Hosts db');
+	$ddb = esmith::DomainsDB->open()  || die('Couldn't open Domains db');
     
     my $title = $c->l('${prefix}_${MenuDescription}');
-    my $modul = "";
+    my $modul = '';
 
 	# Accessing all parameters
     my $params = $c->req->params->to_hash;
diff --git a/Templates/custom.pm.tem b/Templates/custom.pm.tem
index ba67522..f204fd2 100644
--- a/Templates/custom.pm.tem
+++ b/Templates/custom.pm.tem
@@ -30,11 +30,11 @@ my $ddb;
 		my $c = shift;
 		my $$${prefix}_data = shift; #Data hash as parameter
 		# Validation for each field 
-		my $ret = "";
+		my $ret = '';
 		<tal:block tal:repeat="field fields[panel]">
 		if (! TRUE) #validate $c->param('${field}')
 			{$ret .= 'Validation for ${field} failed';}	</tal:block>
-		if ($ret eq "") {$ret = 'ok';}
+		if ($ret eq '') {$ret = 'ok';}
 		return $ret;
 	}
 </tal:block>
@@ -114,14 +114,14 @@ sub get_${tablecontrol[0]} {
 	sub perform_${panel} {
 		my $c = shift;
 		my $$${prefix}_data = shift; #Data hash as parameter
-		my $ret = "";
+		my $ret = '';
 		my $db = $cdb; #maybe one of the others
 		my $dbkey = 'ChangeThis';
 		# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
 		<tal:block tal:repeat="field fields[panel]">
 		if (! TRUE) #copy or perform with value: ${field} e.g. $db->set_prop($dbkey,'${field}',$c->param('${field}'),type=>'service'))
 			{$ret .= 'Perform/save failed for ${field}';}</tal:block>
-		if ($ret eq "") {$ret = 'ok';}
+		if ($ret eq '') {$ret = 'ok';}
 		return $ret;
 	}
 </tal:block>
@@ -132,4 +132,4 @@ sub create_link{
 	my $link = "$route?trt=$panel&Selected=$index";
 	return $link;
 }
-1;
+1;
\ No newline at end of file