diff --git a/COPYING.LESSER b/COPYING.LESSER
index cca7fc278..65c5ca88a 100644
--- a/COPYING.LESSER
+++ b/COPYING.LESSER
@@ -1,4 +1,4 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
diff --git a/bin/verilator_gantt b/bin/verilator_gantt
index cf4bf6c65..e1036419d 100755
--- a/bin/verilator_gantt
+++ b/bin/verilator_gantt
@@ -21,8 +21,8 @@ our %Global;
 
 autoflush STDOUT 1;
 autoflush STDERR 1;
-Getopt::Long::config ("no_auto_abbrev");
-if (! GetOptions (
+Getopt::Long::config("no_auto_abbrev");
+if (! GetOptions(
           "help"        => \&usage,
           "scale=i"     => \$Opt_Time_Per_Char,
           "debug"       => sub { $Debug = 1; },
@@ -156,8 +156,8 @@ sub report {
     # of synchronization and scheduling should not.)
     print "\nAnalysis:\n";
     printf "  Total threads             = %d\n", $nthreads;
-    printf "  Total mtasks              = %d\n", scalar (keys %Mtasks);
-    printf "  Total cpus used           = %d\n", scalar (keys %{$Global{cpus}});
+    printf "  Total mtasks              = %d\n", scalar(keys %Mtasks);
+    printf "  Total cpus used           = %d\n", scalar(keys %{$Global{cpus}});
     printf "  Total yields              = %d\n", $Global{stats}{yields};
     printf "  Total eval time           = %d rdtsc ticks\n", $Global{last_end};
     printf "  Longest mtask time        = %d rdtsc ticks\n", $long_mtask_time;
diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h
index e9ff7e9cb..389f446cf 100644
--- a/include/verilated_vcd_c.h
+++ b/include/verilated_vcd_c.h
@@ -305,8 +305,8 @@ public:
         *m_writep++=' '; printCode(code); *m_writep++='\n';
         bufferCheck();
     }
-    inline void fullQuadX(vluint32_t code, int bits) { fullBusX (code, bits); }
-    inline void fullArrayX(vluint32_t code, int bits) { fullBusX (code, bits); }
+    inline void fullQuadX(vluint32_t code, int bits) { fullBusX(code, bits); }
+    inline void fullArrayX(vluint32_t code, int bits) { fullBusX(code, bits); }
 
     /// Inside dumping routines, dump one signal if it has changed
     inline void chgBit(vluint32_t code, const vluint32_t newval) {
diff --git a/internals.pod b/internals.pod
index 811f15bb5..4ef1e3b9b 100644
--- a/internals.pod
+++ b/internals.pod
@@ -571,7 +571,7 @@ call will correctly see the change. Alternatively:
 
     lp = nodep->lhsp();
     // nodep->lhsp() is 0x1234000, lp is 0x1234000
-    iterateAndNextNull(lp); **lhsp=NULL;** // and under covers nodep->lhsp() changes
+    iterateAndNextNull(lp); **lhsp=NULL;**  // and under covers nodep->lhsp() changes
     // nodep->lhsp() is 0x5678400, lp is 0x1234000
     iterateAndNextNull(lp);
 
diff --git a/src/V3Active.cpp b/src/V3Active.cpp
index 23d78cf3c..9143b51b9 100644
--- a/src/V3Active.cpp
+++ b/src/V3Active.cpp
@@ -67,7 +67,7 @@ private:
 
     SenTreeSet  m_activeSens;  // Sen lists for each active we've made
     typedef vl_unordered_map<AstSenTree*, AstActive*> ActiveMap;
-    ActiveMap m_activeMap; // Map sentree to active, for folding.
+    ActiveMap m_activeMap;  // Map sentree to active, for folding.
 
     // METHODS
     void addActive(AstActive* nodep) {
diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
index a717f1ec1..419666a9e 100644
--- a/src/V3Assert.cpp
+++ b/src/V3Assert.cpp
@@ -112,7 +112,7 @@ private:
 	AstNode* bodysp = NULL;
 	bool selfDestruct = false;
         AstIf* ifp = NULL;
-	if (AstPslCover* snodep = VN_CAST(nodep, PslCover)) {
+        if (AstPslCover* snodep = VN_CAST(nodep, PslCover)) {
             ++m_statAsCover;
 	    if (!v3Global.opt.coverageUser()) {
 		selfDestruct = true;
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index f716ea848..e827b742f 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -68,7 +68,7 @@ public:
         ,m_num(V3Number(fl,32,num)) { dtypeSetLogicSized(m_num.width(),
 							 m_num.sized()?0:m_num.widthMin(),
 							 AstNumeric::UNSIGNED); }
-    class Unsized32 {};         // for creator type-overload selection
+    class Unsized32 {};  // for creator type-overload selection
     AstConst(FileLine* fl, Unsized32, uint32_t num)  // Unsized 32-bit integer of specified value
         :AstNodeMath(fl)
         ,m_num(V3Number(fl,32,num)) { m_num.width(32,false); dtypeSetLogicSized(32,m_num.widthMin(),
diff --git a/src/V3Const.cpp b/src/V3Const.cpp
index e0ee04255..67e6b365a 100644
--- a/src/V3Const.cpp
+++ b/src/V3Const.cpp
@@ -1755,7 +1755,7 @@ private:
 		if (nextp && !cmp(senp, nextp)) {
 		    // Something's out of order, sort it
 		    senp = NULL;
-		    std::vector<AstNodeSenItem*> vec;
+                    std::vector<AstNodeSenItem*> vec;
                     for (AstNodeSenItem* senp = VN_CAST(nodep->sensesp(), NodeSenItem);
                          senp; senp=VN_CAST(senp->nextp(), NodeSenItem)) {
 			vec.push_back(senp);
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index c8505b44c..eb03883e7 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -351,7 +351,7 @@ public:
 	    }
 	    else {
 		nodep->v3error(nodep->verilogKwd()
-			       << " loading other than unpacked-array variable");
+                               << " loading other than unpacked-array variable");
 	    }
 	}
 	putbs(", ");
@@ -1290,7 +1290,7 @@ void EmitCStmts::emitVarCtors(bool* firstp) {
 	ofp()->indentInc();
 	puts("\n");
 	puts("#if (SYSTEMC_VERSION>20011000)\n");  // SystemC 2.0.1 and newer
-	for (VarVec::iterator it = m_ctorVarsVec.begin(); it != m_ctorVarsVec.end(); ++it) {
+        for (VarVec::iterator it = m_ctorVarsVec.begin(); it != m_ctorVarsVec.end(); ++it) {
             const AstVar* varp = *it;
             bool isArray = !VN_CAST(varp->dtypeSkipRefp(), BasicDType);
 	    if (isArray) {
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index b1da4d33b..b669a6f92 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -162,7 +162,7 @@ string V3Error::warnMore() {
     return msgPrefix();
 }
 
-void V3Error::v3errorEnd (std::ostringstream& sstr) {
+void V3Error::v3errorEnd(std::ostringstream& sstr) {
 #if defined(__COVERITY__) || defined(__cppcheck__)
     if (s_errorCode==V3ErrorCode::EC_FATAL) __coverity_panic__(x);
 #endif
diff --git a/src/V3Error.h b/src/V3Error.h
index c0fad9f76..10d23a3e2 100644
--- a/src/V3Error.h
+++ b/src/V3Error.h
@@ -211,7 +211,7 @@ class V3Error {
     static int		s_errCount;		// Error count
     static int		s_warnCount;		// Warning count
     static int 		s_tellManual;		// Tell user to see manual, 0=not yet, 1=doit, 2=disable
-    static std::ostringstream s_errorStr;               // Error string being formed
+    static std::ostringstream s_errorStr;       // Error string being formed
     static V3ErrorCode	s_errorCode;		// Error string being formed will abort
     static bool		s_errorSuppressed;	// Error being formed should be suppressed
     static MessagesSet	s_messages;		// What errors we've outputted
@@ -256,7 +256,7 @@ class V3Error {
 	s_errorStr.str(""); s_errorCode=code; s_errorSuppressed=false; }
     static std::ostringstream& v3errorStr() { return s_errorStr; }
     static void	vlAbort();
-    static void v3errorEnd(std::ostringstream& sstr);   // static, but often overridden in classes.
+    static void v3errorEnd(std::ostringstream& sstr);  // static, but often overridden in classes.
 };
 
 // Global versions, so that if the class doesn't define a operator, we get the functions anyways.
diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp
index 015f289fc..a9bdba4ef 100644
--- a/src/V3GraphAlg.cpp
+++ b/src/V3GraphAlg.cpp
@@ -122,7 +122,7 @@ private:
     }
 public:
     GraphRemoveRedundant(V3Graph* graphp, V3EdgeFuncP edgeFuncp, bool sumWeights)
-	: GraphAlg<>(graphp, edgeFuncp), m_sumWeights(sumWeights) {
+        : GraphAlg<>(graphp, edgeFuncp), m_sumWeights(sumWeights) {
 	main();
     }
     ~GraphRemoveRedundant() {}
@@ -210,7 +210,7 @@ private:
     }
 public:
     GraphAlgWeakly(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	main();
     }
     ~GraphAlgWeakly() {}
@@ -295,7 +295,7 @@ private:
     }
 public:
     GraphAlgStrongly(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	m_currentDfs = 0;
 	main();
     }
@@ -348,7 +348,7 @@ private:
     }
 public:
     GraphAlgRank(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	main();
     }
     ~GraphAlgRank() {}
@@ -406,7 +406,7 @@ private:
     }
 public:
     GraphAlgRLoops(V3Graph* graphp, V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	m_done = false;
 	main(vertexp);
     }
@@ -453,7 +453,7 @@ private:
 public:
     GraphAlgSubtrees(V3Graph* graphp, V3Graph* loopGraphp,
 		     V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp)
-	: GraphAlg<>(graphp, edgeFuncp), m_loopGraphp (loopGraphp) {
+        : GraphAlg<>(graphp, edgeFuncp), m_loopGraphp (loopGraphp) {
 	// Vertex::m_userp - New vertex if we have seen this vertex already
 	// Edge::m_userp - New edge if we have seen this edge already
 	m_graphp->userClearVertices();
diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp
index 8a964f7bd..343741880 100644
--- a/src/V3GraphDfa.cpp
+++ b/src/V3GraphDfa.cpp
@@ -348,7 +348,7 @@ private:
 
 public:
     GraphNfaToDfa(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	m_step = 0;
 	main();
     }
@@ -471,7 +471,7 @@ private:
     }
 public:
     DfaGraphReduce(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(graphp, edgeFuncp) {
+        : GraphAlg<>(graphp, edgeFuncp) {
 	if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_in");
 	optimize_accepting_out();
 	if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_acc");
@@ -561,7 +561,7 @@ private:
     }
 public:
     DfaGraphComplement(V3Graph* dfagraphp, V3EdgeFuncP edgeFuncp)
-	: GraphAlg<>(dfagraphp, edgeFuncp) {
+        : GraphAlg<>(dfagraphp, edgeFuncp) {
 	if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_in");
 
 	// Vertex::m_user begin: 1 indicates new edge, no more processing
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index c6b1fc5d2..d8041b9c0 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -401,7 +401,7 @@ private:
         // the updated t_clocker VCD test.
         // If reenable this visitor note AstNodeMath short circuit below
     }
-    virtual void visit(AstNodeMath* nodep) {} // Accelerate
+    virtual void visit(AstNodeMath* nodep) {}  // Accelerate
     virtual void visit(AstNode* nodep) {
         iterateChildren(nodep);
     }
@@ -1321,7 +1321,7 @@ inline void OrderMoveDomScope::movedVertex(OrderVisitor* ovp, OrderMoveVertex* v
     if (!m_onReadyList) {
         vertexp->v3fatalSrc("Moving vertex from ready when nothing was on que as ready.");
     }
-    if (m_readyVertices.empty()) {      // Else more work to get to later
+    if (m_readyVertices.empty()) {  // Else more work to get to later
         m_onReadyList = false;
         m_readyDomScopeE.unlink(ovp->m_pomReadyDomScope, this);
     }
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index 47d8fd4b8..b51bf504d 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -375,7 +375,7 @@ private:
 	    } else {
 		UINFO(4,"Autoflush "<<nodep<<endl);
 		nodep->addNextHere(new AstFFlush(nodep->fileline(),
-						 AstNode::cloneTreeNull(nodep->filep(), true)));
+                                                 AstNode::cloneTreeNull(nodep->filep(), true)));
 	    }
 	}
     }
diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp
index 7e01f2aff..8c5d0cd4d 100644
--- a/src/V3Reloop.cpp
+++ b/src/V3Reloop.cpp
@@ -45,7 +45,7 @@
 #include "V3Stats.h"
 #include "V3Ast.h"
 
-#define RELOOP_MIN_ITERS 40   // Need at least this many loops to do this optimization
+#define RELOOP_MIN_ITERS 40  // Need at least this many loops to do this optimization
 
 //######################################################################
 
@@ -122,7 +122,7 @@ private:
                 AstNode* lbitp = m_mgSelLp->bitp();
                 lbitp->replaceWith(new AstVarRef(fl, itp, false));
                 lbitp->deleteTree(); VL_DANGLING(lbitp);
-                if (m_mgSelRp) { // else constant and no replace
+                if (m_mgSelRp) {  // else constant and no replace
                     AstNode* rbitp = m_mgSelRp->bitp();
                     rbitp->replaceWith(new AstVarRef(fl, itp, false));
                     rbitp->deleteTree(); VL_DANGLING(lbitp);
@@ -184,7 +184,7 @@ private:
             }
         }
 
-        if (m_mgSelLp) { // Old merge
+        if (m_mgSelLp) {  // Old merge
             if (m_mgCfuncp == m_cfuncp
                 && m_mgNextp == nodep
                 && m_mgSelLp->same(lselp)
@@ -260,7 +260,7 @@ public:
 void V3Reloop::reloopAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
     {
-        ReloopVisitor visitor (nodep);
+        ReloopVisitor visitor(nodep);
     }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("reloop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
 }
diff --git a/src/V3Reloop.h b/src/V3Reloop.h
index ad9eb58ff..c5899a42f 100644
--- a/src/V3Reloop.h
+++ b/src/V3Reloop.h
@@ -32,4 +32,4 @@ public:
     static void reloopAll(AstNetlist* nodep);
 };
 
-#endif // Guard
+#endif  // Guard
diff --git a/src/V3Split.cpp b/src/V3Split.cpp
index 28f540dba..d56135c3e 100644
--- a/src/V3Split.cpp
+++ b/src/V3Split.cpp
@@ -1002,14 +1002,14 @@ private:
 void V3Split::splitReorderAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
     {
-        ReorderVisitor visitor (nodep);
+        ReorderVisitor visitor(nodep);
     }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
 void V3Split::splitAlwaysAll(AstNetlist* nodep) {
     UINFO(2,__FUNCTION__<<": "<<endl);
     {
-        SplitVisitor visitor (nodep);
+        SplitVisitor visitor(nodep);
     }  // Destruct before checking
     V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
 }
diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp
index 056874215..ee8d7c8b8 100644
--- a/src/V3StatsReport.cpp
+++ b/src/V3StatsReport.cpp
@@ -206,7 +206,7 @@ StatsReport::StatColl	StatsReport::s_allStats;
 //######################################################################
 // V3Statstic class
 
-void V3Statistic::dump (std::ofstream& os) const {
+void V3Statistic::dump(std::ofstream& os) const {
     if (perf()) {
         os<<"  "<<std::right<<std::fixed<<std::setprecision(6)<<std::setw(9)<<count();
     } else {
diff --git a/src/V3TSP.h b/src/V3TSP.h
index 8b85fb5a6..81f072443 100644
--- a/src/V3TSP.h
+++ b/src/V3TSP.h
@@ -53,4 +53,4 @@ namespace V3TSP {
 }
 
 
-#endif // Guard
+#endif  // Guard
diff --git a/src/V3Task.cpp b/src/V3Task.cpp
index 4107e7255..a0511fe4b 100644
--- a/src/V3Task.cpp
+++ b/src/V3Task.cpp
@@ -358,7 +358,7 @@ private:
     AstNode* createInlinedFTask(AstNodeFTaskRef* refp, const string& namePrefix, AstVarScope* outvscp) {
 	// outvscp is the variable for functions only, if NULL, it's a task
 	if (!refp->taskp()) refp->v3fatalSrc("Unlinked?");
-	AstNode* newbodysp = AstNode::cloneTreeNull(refp->taskp()->stmtsp(), true);  // Maybe NULL
+        AstNode* newbodysp = AstNode::cloneTreeNull(refp->taskp()->stmtsp(), true);  // Maybe NULL
 	AstNode* beginp = new AstComment(refp->fileline(), (string)("Function: ")+refp->name());
 	if (newbodysp) beginp->addNext(newbodysp);
 	if (debug()>=9) { beginp->dumpTreeAndNext(cout,"-newbegi:"); }
@@ -1140,8 +1140,8 @@ private:
 	AstVarScope* outvscp = NULL;
 	if (nodep->taskp()->isFunction()) {
 	    // Not that it's a FUNCREF, but that we're calling a function (perhaps as a task)
-            outvscp = createVarScope (VN_CAST(nodep->taskp()->fvarp(), Var),
-				      namePrefix+"__Vfuncout");
+            outvscp = createVarScope(VN_CAST(nodep->taskp()->fvarp(), Var),
+                                     namePrefix+"__Vfuncout");
 	}
 	// Create cloned statements
 	AstNode* beginp;
diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp
index 10c30a72c..f1ce6979f 100644
--- a/src/V3Trace.cpp
+++ b/src/V3Trace.cpp
@@ -419,7 +419,7 @@ private:
 	UINFO(9,"Making trees\n");
 
         typedef std::set<uint32_t> ActCodeSet;  // All activity numbers applying to a given trace
-        typedef std::multimap<ActCodeSet,TraceTraceVertex*> TraceVec;   // For activity set, what traces apply
+        typedef std::multimap<ActCodeSet,TraceTraceVertex*> TraceVec;  // For activity set, what traces apply
 	TraceVec traces;
 
 	// Form sort structure
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 3e83362e4..b496b9ed6 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -187,7 +187,7 @@ private:
 	    // If we got ==1'bx it can never be true (but 1'bx==1'bx can be!)
             if (((VN_IS(lhsp, Const) && VN_CAST(lhsp, Const)->num().isFourState())
                  || (VN_IS(rhsp, Const) && VN_CAST(rhsp, Const)->num().isFourState()))) {
-                V3Number num (nodep->fileline(), 1, (VN_IS(nodep, EqCase) ? 0:1));
+                V3Number num(nodep->fileline(), 1, (VN_IS(nodep, EqCase) ? 0:1));
 		newp = new AstConst (nodep->fileline(), num);
 		lhsp->deleteTree(); VL_DANGLING(lhsp);
 		rhsp->deleteTree(); VL_DANGLING(rhsp);
diff --git a/src/V3Width.cpp b/src/V3Width.cpp
index ab96ef33d..528818bd1 100644
--- a/src/V3Width.cpp
+++ b/src/V3Width.cpp
@@ -1285,7 +1285,7 @@ private:
 	// Assign missing values
 	V3Number num (nodep->fileline(), nodep->width(), 0);
 	V3Number one (nodep->fileline(), nodep->width(), 1);
-	std::map<V3Number,AstEnumItem*> inits;
+        std::map<V3Number,AstEnumItem*> inits;
         for (AstEnumItem* itemp = nodep->itemsp(); itemp; itemp=VN_CAST(itemp->nextp(), EnumItem)) {
 	    if (itemp->valuep()) {
 		if (debug()>=9) { UINFO(0,"EnumInit "<<itemp<<endl); itemp->valuep()->dumpTree(cout,"-EnumInit: "); }
@@ -1442,7 +1442,7 @@ private:
             backip = VN_CAST(itemp->backp(), MemberDType);
 	    itemp->lsb(lsb);
             if (VN_IS(nodep, UnionDType)) {
-		width = std::max(width, itemp->width());
+                width = std::max(width, itemp->width());
 	    } else {
 		lsb += itemp->width();
 		width += itemp->width();
diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp
index 0162325ba..c64ca081c 100644
--- a/src/VlcTop.cpp
+++ b/src/VlcTop.cpp
@@ -32,7 +32,7 @@
 void VlcTop::readCoverage(const string& filename, bool nonfatal) {
     UINFO(2,"readCoverage "<<filename<<endl);
 
-    std::ifstream is (filename.c_str());
+    std::ifstream is(filename.c_str());
     if (!is) {
 	if (!nonfatal) v3fatal("Can't read "<<filename);
 	return;
@@ -69,7 +69,7 @@ void VlcTop::readCoverage(const string& filename, bool nonfatal) {
 void VlcTop::writeCoverage(const string& filename) {
     UINFO(2,"writeCoverage "<<filename<<endl);
 
-    std::ofstream os (filename.c_str());
+    std::ofstream os(filename.c_str());
     if (!os) {
 	v3fatal("Can't write "<<filename);
 	return;
@@ -203,13 +203,13 @@ void VlcTop::annotateOutputFiles(const string& dirname) {
 
 	UINFO(1,"annotateOutputFile "<<filename<<" -> "<<outfilename<<endl);
 
-        std::ifstream is (filename.c_str());
+        std::ifstream is(filename.c_str());
 	if (!is) {
 	    v3error("Can't read "<<filename);
 	    return;
 	}
 
-        std::ofstream os (outfilename.c_str());
+        std::ofstream os(outfilename.c_str());
 	if (!os) {
 	    v3fatal("Can't write "<<outfilename);
 	    return;
diff --git a/test_regress/t/t_alw_noreorder.pl b/test_regress/t/t_alw_noreorder.pl
index e7f37da92..58ff89bc9 100755
--- a/test_regress/t/t_alw_noreorder.pl
+++ b/test_regress/t/t_alw_noreorder.pl
@@ -10,18 +10,18 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 scenarios(vlt_all => 1);
 
 top_filename("t/t_alw_reorder.v");
-compile (
+compile(
     verilator_flags2 => ["--stats -Or"],
     );
 
-file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
 # Here we should see some dly vars since reorder is disabled.
 # (Whereas our twin test, t_alw_reorder, should see no dly vars
 #  since it enables the reorder step.)
-file_grep ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v1/i);
-file_grep ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v2/i);
+file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v1/i);
+file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v2/i);
 
-execute (
+execute(
     check_finished=>1,
     );
 
diff --git a/test_regress/t/t_alw_nosplit.pl b/test_regress/t/t_alw_nosplit.pl
index c5df1d229..a9edeead4 100755
--- a/test_regress/t/t_alw_nosplit.pl
+++ b/test_regress/t/t_alw_nosplit.pl
@@ -9,15 +9,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-compile (
+compile(
     verilator_flags2 => ["--stats"],
     );
 
 if ($Self->{vlt_all}) {
-    file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
 }
 
-execute (
+execute(
     check_finished=>1,
     );
 
diff --git a/test_regress/t/t_alw_nosplit.v b/test_regress/t/t_alw_nosplit.v
index 971676e16..4d1db199e 100644
--- a/test_regress/t/t_alw_nosplit.v
+++ b/test_regress/t/t_alw_nosplit.v
@@ -88,7 +88,7 @@ module t (/*AUTOARG*/
          h_split_1 <= 16'h0;
          h_split_2 <= 16'h0;
       end
-   end // always @ (posedge clk)
+   end  // always @ (posedge clk)
 
    always @ (posedge clk) begin
       if (cyc!=0) begin
diff --git a/test_regress/t/t_alw_reorder.pl b/test_regress/t/t_alw_reorder.pl
index 223be40a2..bedc40be3 100755
--- a/test_regress/t/t_alw_reorder.pl
+++ b/test_regress/t/t_alw_reorder.pl
@@ -9,11 +9,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(vlt_all => 1);
 
-compile (
+compile(
     verilator_flags2 => ["--stats"],
     );
 
-file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
+file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
 # Important: if reorder succeeded, we should see no dly vars.
 # Equally important: twin test t_alw_noreorder should see dly vars,
 #  is identical to this test except for disabling the reorder step.
@@ -24,7 +24,7 @@ foreach my $file ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp",
     file_grep_not($file, qr/dly__t__DOT__v3/i);
 }
 
-execute (
+execute(
     check_finished=>1,
     );
 
diff --git a/test_regress/t/t_alw_split.pl b/test_regress/t/t_alw_split.pl
index 4cd411731..b0117e349 100755
--- a/test_regress/t/t_alw_split.pl
+++ b/test_regress/t/t_alw_split.pl
@@ -14,7 +14,7 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 3);
+    file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 3);
 }
 
 execute(
diff --git a/test_regress/t/t_alw_split.v b/test_regress/t/t_alw_split.v
index 0088166e8..f852753ec 100644
--- a/test_regress/t/t_alw_split.v
+++ b/test_regress/t/t_alw_split.v
@@ -82,6 +82,6 @@ module t (/*AUTOARG*/
 	    $finish;
 	 end
       end
-   end // always @ (posedge clk)
+   end  // always @ (posedge clk)
 
 endmodule
diff --git a/test_regress/t/t_case_huge.pl b/test_regress/t/t_case_huge.pl
index 20fdf61e5..14ce67913 100755
--- a/test_regress/t/t_case_huge.pl
+++ b/test_regress/t/t_case_huge.pl
@@ -14,9 +14,9 @@ compile(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep ($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10);
-    file_grep ($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i,
-               ($Self->{vltmt} ? 0 : 8));
+    file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10);
+    file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i,
+              ($Self->{vltmt} ? 0 : 8));
 }
 
 execute(