diff --git a/templates/bash_simple_template b/templates/bash_simple_template
index 9606209..48ba2e6 100755
--- a/templates/bash_simple_template
+++ b/templates/bash_simple_template
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Template to start a simple bash program.  This is designed only for the
-# simplest of programs where all program parameters are positional, there is no
+# simplest of programs where all program paramters are positional, there is no
 # help text, etc.
 
 # Description of argument(s):
-# parm1            Bla, bla, bla (e.g. "example data").
+# parm1                             Bla, bla, bla (e.g. "example data").
 
 
 function get_parms {
diff --git a/templates/pgm_template.robot b/templates/pgm_template.robot
index 12a89e7..cd02fda 100755
--- a/templates/pgm_template.robot
+++ b/templates/pgm_template.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 
-# Copy this template as a base to get a start on a robot program. You may
-# remove any generic comments (like this one).
+# Copy this template as a base to get a start on a robot program. You may remove any generic comments (like
+# this one).
 
 Documentation  Base to get a start on a robot program.
 
diff --git a/templates/pgm_template.tcl b/templates/pgm_template.tcl
index 3e67794..39f47ad 100755
--- a/templates/pgm_template.tcl
+++ b/templates/pgm_template.tcl
@@ -24,8 +24,7 @@
 
 proc exit_proc { {ret_code 0} } {
 
-  # Execute whenever the program ends normally or with the signals that we
-  # catch (i.e. TERM, INT).
+  # Execute whenever the program ends normally or with the signals that we catch (i.e. TERM, INT).
 
   dprint_executing
   dprint_var ret_code
diff --git a/templates/python_pgm_template b/templates/python_pgm_template
index 11db412..b7fe32f 100644
--- a/templates/python_pgm_template
+++ b/templates/python_pgm_template
@@ -32,12 +32,11 @@
 def exit_function(signal_number=0,
                   frame=None):
     r"""
-    Execute whenever the program ends normally or with the signals that we
-    catch (i.e. TERM, INT).
+    Execute whenever the program ends normally or with the signals that we catch (i.e. TERM, INT).
     """
 
-    # This function will be called by gen_exit_function().  If you have no
-    # cleanup to do, you can delete this function altogether.
+    # This function will be called by gen_exit_function().  If you have no cleanup to do, you can delete
+    # this function altogether.
 
     # Your cleanup code here.
 
@@ -47,8 +46,8 @@
     Validate program parameters, etc.
     """
 
-    # This function will be called by gen_setup().  If you have no validation
-    # to do, you can delete this function altogether.
+    # This function will be called by gen_setup().  If you have no validation to do, you can delete this
+    # function altogether.
 
     # Your validation code here...
     # valid_value(whatever)