diff --git a/modvis.py b/modvis.py
index e048b7f..2431014 100644
--- a/modvis.py
+++ b/modvis.py
@@ -235,7 +235,7 @@ class ImportVisitor(ast.NodeVisitor):
 
 def main():
     usage = """usage: %prog FILENAME... [--dot|--tgf|--yed]"""
-    desc = "Analyse one or more Python source files and generate an" "approximate module dependency graph."
+    desc = "Analyse one or more Python source files and generate an approximate module dependency graph."
     parser = OptionParser(usage=usage, description=desc)
     parser.add_option("--dot", action="store_true", default=False, help="output in GraphViz dot format")
     parser.add_option("--tgf", action="store_true", default=False, help="output in Trivial Graph Format")
diff --git a/pyan/writers.py b/pyan/writers.py
index 5b3335d..9531cc9 100644
--- a/pyan/writers.py
+++ b/pyan/writers.py
@@ -128,7 +128,7 @@ class DotWriter(Writer):
 
         # translucent gray (no hue to avoid visual confusion with any
         # group of colored nodes)
-        self.write('graph [style="filled,rounded",' 'fillcolor="#80808018", label="%s"];' % graph.label)
+        self.write('graph [style="filled,rounded", fillcolor="#80808018", label="%s"];' % graph.label)
 
     def finish_subgraph(self, graph):
         self.log("Finish subgraph %s" % graph.label)
@@ -148,9 +148,9 @@ class DotWriter(Writer):
         target = edge.target
         color = edge.color
         if edge.flavor == "defines":
-            self.write('    %s -> %s [style="dashed",' ' color="%s"];' % (source.id, target.id, color))
+            self.write('    %s -> %s [style="dashed",  color="%s"];' % (source.id, target.id, color))
         else:  # edge.flavor == 'uses':
-            self.write('    %s -> %s [style="solid",' ' color="%s"];' % (source.id, target.id, color))
+            self.write('    %s -> %s [style="solid",  color="%s"];' % (source.id, target.id, color))
 
     def finish_graph(self):
         self.write("}")  # terminate "digraph G {"
@@ -250,7 +250,7 @@ class YedWriter(Writer):
         self.indent()
         self.write('<y:Fill color="#CCCCCC" transparent="false"/>')
         self.write(
-            '<y:NodeLabel modelName="internal" modelPosition="t" ' 'alignment="right">%s</y:NodeLabel>' % graph.label
+            '<y:NodeLabel modelName="internal" modelPosition="t" alignment="right">%s</y:NodeLabel>' % graph.label
         )
         self.write('<y:Shape type="roundrectangle"/>')
         self.dedent()
@@ -282,7 +282,7 @@ class YedWriter(Writer):
         self.indent()
         self.write('<y:Geometry height="%s" width="%s"/>' % ("30", width))
         self.write('<y:Fill color="%s" transparent="false"/>' % node.fill_color)
-        self.write('<y:BorderStyle color="#000000" type="line" ' 'width="1.0"/>')
+        self.write('<y:BorderStyle color="#000000" type="line" width="1.0"/>')
         self.write("<y:NodeLabel>%s</y:NodeLabel>" % node.label)
         self.write('<y:Shape type="ellipse"/>')
         self.dedent()
@@ -303,9 +303,9 @@ class YedWriter(Writer):
         self.write("<y:PolyLineEdge>")
         self.indent()
         if edge.flavor == "defines":
-            self.write('<y:LineStyle color="%s" ' 'type="dashed" width="1.0"/>' % edge.color)
+            self.write('<y:LineStyle color="%s" type="dashed" width="1.0"/>' % edge.color)
         else:
-            self.write('<y:LineStyle color="%s" ' 'type="line" width="1.0"/>' % edge.color)
+            self.write('<y:LineStyle color="%s" type="line" width="1.0"/>' % edge.color)
         self.write('<y:Arrows source="none" target="standard"/>')
         self.write('<y:BendStyle smoothed="true"/>')
         self.dedent()
diff --git a/setup.py b/setup.py
index f6b2aca..9dfae43 100644
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setup(
         "Development Status :: 4 - Beta",
         "Environment :: Console",
         "Intended Audience :: Developers",
-        ("License :: OSI Approved :: " "GNU General Public License v2 (GPLv2)"),
+        "License :: OSI Approved ::  GNU General Public License v2 (GPLv2)",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",