diff --git a/songbook/build.py b/songbook/build.py
index dcad965f..39fb33cc 100755
--- a/songbook/build.py
+++ b/songbook/build.py
@@ -178,8 +178,8 @@ def makeTexFile(sb, output):
 
     # output template
     commentPattern = re.compile(r"^\s*%")
-    with codecs.open(os.path.join(template_dir, template), 'r', 'utf-8') as f:
-        content = [line for line in f if not commentPattern.match(line)]
+    with codecs.open(os.path.join(template_dir, template), 'r', 'utf-8') as template_file:
+        content = [line for line in template_file if not commentPattern.match(line)]
 
         for index, line in enumerate(content):
             if re.compile("getDataImgDirectory").search(line):
diff --git a/songbook/plastex.py b/songbook/plastex.py
index 6b16498e..f1065024 100755
--- a/songbook/plastex.py
+++ b/songbook/plastex.py
@@ -12,7 +12,7 @@ import sys
 
 
 def processUnbreakableSpace(node):
-    """Replace '~' and '\ ' in node by nodes that 
+    """Replace '~' and '\ ' in node by nodes that
     will be rendered as unbreakable space.
 
     Return node object for convenience.