More small fixes/refactoring

Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/tests/adder/sim.v b/tests/adder/sim.v
index 3411e3e..9b834eb 100644
--- a/tests/adder/sim.v
+++ b/tests/adder/sim.v
@@ -3,10 +3,12 @@
 	input a,
 	input b,
 	input ci,
+
 	(* DELAY_CONST_a = "20e-12" *)
 	(* DELAY_CONST_b = "20e-12" *)
 	(* DELAY_CONST_ci = "10e-12" *)
 	output y,
+	
 	(* DELAY_CONST_a = "10e-12" *)
 	(* DELAY_CONST_b = "10e-12" *)
 	(* DELAY_CONST_ci = "7e-12" *)
diff --git a/vlog_to_model.py b/vlog_to_model.py
index 7192b02..b3fcd5f 100755
--- a/vlog_to_model.py
+++ b/vlog_to_model.py
@@ -7,10 +7,12 @@
 
     - `(* ASSOC_CLOCK="RDCLK" *)` : force a port's associated clock to a given value
 """
-import yosys.run
-import lxml.etree as ET
 import argparse, re
 import os, tempfile, sys
+
+import lxml.etree as ET
+
+import yosys.run
 from yosys.json import YosysJson
 
 
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py
index 9298604..8dd5fee 100755
--- a/vlog_to_pbtype.py
+++ b/vlog_to_pbtype.py
@@ -5,11 +5,13 @@
 
 The following are allowed on a top level module:
 
-    - `(* TYPE="bel|blackbox" *)` : specify the type of the module
-    (either a Basic ELement or a blackbox named after the pb_type
+    - `(* blackbox *)` : specify that the module has no interconnect or child
+    pb_types (but if modes are used then its modes are allowed to have these).
+    This will also set the BLIF model to be `.subckt <name>` unless CLASS is
+    also specified.
 
     - `(* CLASS="lut|routing|flipflop|mem" *)` : specify the class of an given
-    instance. Must be specified for BELs
+    instance.
 
     - `(* ALTERNATIVE_TO="module" *)` : specify the module is one of several
     modes of another module (i.e. a <mode> in the pb_type). Note that all modes
@@ -36,12 +38,13 @@
     - `(* PORT_CLASS="clock" *)` : specify the VPR "port_class"
 """
 
-import yosys.run
-import lxml.etree as ET
-import argparse, re
 import os, tempfile, sys
-from yosys.json import YosysJson
+import argparse, re
 
+import lxml.etree as ET
+
+import yosys.run
+from yosys.json import YosysJson
 
 parser = argparse.ArgumentParser(description=__doc__.strip(), formatter_class=argparse.RawTextHelpFormatter)
 parser.add_argument(
diff --git a/yosys/run.py b/yosys/run.py
index 37e3349..3f50221 100755
--- a/yosys/run.py
+++ b/yosys/run.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
-import os, subprocess, sys, json
-import yosys.utils, tempfile, re
+import os, subprocess, sys, re
+import tempfile, json
+import yosys.utils
 
 def get_yosys():
     return os.getenv('YOSYS', "yosys")