diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index f84006bb8f169336639ffaf35375c25648d6af6b..a698279eab185901b23ae8f823d33e0c112cf925 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -569,7 +569,8 @@ def parse_args(args):
             help='EDGE location code, e.g. "R0", "R1"',
             type=edge.LocationCode)
     parser.add_argument('--outlocationcode',
-            help='EDGE output location code (when different from --locationcode)',
+            help='EDGE output location code'
+                    ' (if different from --locationcode)',
             type=edge.LocationCode)
     parser.add_argument('--interval',
             default='minute',
diff --git a/geomagio/edge/LocationCode.py b/geomagio/edge/LocationCode.py
index c4eefa949ed0b87755adac6388786552f2d59f55..aa5168eb80567c273618894a172d86923f768620 100644
--- a/geomagio/edge/LocationCode.py
+++ b/geomagio/edge/LocationCode.py
@@ -28,4 +28,5 @@ def LocationCode(code):
     try:
         return re.match('^[A-Z0-9]{2}$', code).group(0)
     except:
-        raise argparse.ArgumentTypeError('Invalid location code, expected /^[A-Z0-9]{2}$/')
+        raise argparse.ArgumentTypeError(
+                'Invalid location code, expected /^[A-Z0-9]{2}$/')
diff --git a/geomagio/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py
index decb592333efc100e63448b11a87fbbb060e391d..10cec07de7005b003065ed5a4301bc5c350a0619 100644
--- a/geomagio/iaga2002/IAGA2002Writer.py
+++ b/geomagio/iaga2002/IAGA2002Writer.py
@@ -118,7 +118,8 @@ class IAGA2002Writer(object):
                     ' INTERMAGNET DVD.')
             comments.append('Go to www.intermagnet.org for details on' +
                     ' obtaining this product.')
-        if 'conditions_of_use' in stats and stats.conditions_of_use is not None:
+        if 'conditions_of_use' in stats and \
+                stats.conditions_of_use is not None:
             comments.append('CONDITIONS OF USE: ' + stats.conditions_of_use)
         # generate comment output
         buf = []