diff --git a/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index b53ad68e560..889600de9c2 100644
--- a/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -78,17 +78,11 @@ private module Frameworks {
   // no frameworks currently modeled
 }
 
-private predicate sourceModelCsv(string row) {
-  none()
-}
+private predicate sourceModelCsv(string row) { none() }
 
-private predicate sinkModelCsv(string row) {
-  none()
-}
+private predicate sinkModelCsv(string row) { none() }
 
-private predicate summaryModelCsv(string row) {
-  none()
-}
+private predicate summaryModelCsv(string row) { none() }
 
 /**
  * A unit class for adding additional source model rows.
diff --git a/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 1e7ac840936..a65e0824a88 100644
--- a/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -45,7 +45,9 @@ module Private {
 
     SummaryNode() { this = MkSummaryInternalNode(c, state) }
 
-    override predicate hasLocationInfo(string fp, int sl, int sc, int el, int ec) { c.hasLocationInfo(fp, sl, sc, el, ec) }
+    override predicate hasLocationInfo(string fp, int sl, int sc, int el, int ec) {
+      c.hasLocationInfo(fp, sl, sc, el, ec)
+    }
 
     override string toString() { result = "[summary] " + state + " in " + c }
 
@@ -352,13 +354,17 @@ module Public {
 
     GlobalFunctionNode() { this = MkGlobalFunctionNode(func) }
 
-    override ParameterNode getParameter(int i) { result = DataFlow::parameterNode(func.getParameter(i)) }
+    override ParameterNode getParameter(int i) {
+      result = DataFlow::parameterNode(func.getParameter(i))
+    }
 
     override string getName() { result = func.getName() }
 
     override Function getFunction() { result = func }
 
-    override ReceiverNode getReceiver() { result = DataFlow::receiverNode(func.(Method).getReceiver()) }
+    override ReceiverNode getReceiver() {
+      result = DataFlow::receiverNode(func.(Method).getReceiver())
+    }
 
     override string getNodeKind() { result = "function " + func.getName() }
 
@@ -379,7 +385,9 @@ module Public {
   class FuncLitNode extends FunctionNode::Range, ExprNode {
     override FuncLit expr;
 
-    override ParameterNode getParameter(int i) { result = DataFlow::parameterNode(expr.getParameter(i)) }
+    override ParameterNode getParameter(int i) {
+      result = DataFlow::parameterNode(expr.getParameter(i))
+    }
 
     override string getName() { none() }
 
@@ -459,7 +467,12 @@ module Public {
       if expr.getArgument(0).getType() instanceof TupleType
       then result = DataFlow::extractTupleElement(DataFlow::exprNode(expr.getArgument(0)), i)
       else
-        result = rank[i + 1](Expr arg, int j | arg = expr.getArgument(j) | DataFlow::exprNode(arg) order by j)
+        result =
+          rank[i + 1](Expr arg, int j |
+            arg = expr.getArgument(j)
+          |
+            DataFlow::exprNode(arg) order by j
+          )
     }
 
     /** Gets the data flow node corresponding to an argument of this call. */
@@ -815,7 +828,8 @@ module Public {
         rhs = this.asInstruction() and ids = rhs.getStmt()
       |
         left = DataFlow::exprNode(ids.getOperand()) and
-        right = DataFlow::instructionNode(any(IR::EvalImplicitOneInstruction one | one.getStmt() = ids)) and
+        right =
+          DataFlow::instructionNode(any(IR::EvalImplicitOneInstruction one | one.getStmt() = ids)) and
         op = ids.getOperator().charAt(0)
       )
     }
diff --git a/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll b/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
index 8ce7677fba1..c101272fe41 100644
--- a/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
+++ b/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
@@ -85,10 +85,10 @@ predicate basicLocalFlowStep(Node nodeFrom, Node nodeTo) {
   )
   or
   // GlobalFunctionNode -> use
-  nodeFrom = any(GlobalFunctionNode fn | fn.getFunction() = nodeTo.asExpr().(FunctionName).getTarget())
+  nodeFrom =
+    any(GlobalFunctionNode fn | fn.getFunction() = nodeTo.asExpr().(FunctionName).getTarget())
 }
 
-
 /**
  * Holds if data can flow from `node1` to `node2` in a way that loses the
  * calling context. For example, this would happen with flow through a
@@ -134,7 +134,7 @@ predicate storeStep(Node node1, Content c, PostUpdateNode node2) {
  */
 predicate readStep(Node node1, Content f, Node node2) {
   node1 = node2.(PointerDereferenceNode).getOperand() and
-  f =  any(DataFlow::PointerContent pc | pc.getPointerType() = node1.getType())
+  f = any(DataFlow::PointerContent pc | pc.getPointerType() = node1.getType())
   or
   exists(FieldReadNode read |
     node2 = read and
diff --git a/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 77683d4e372..47fbf2c0585 100644
--- a/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -133,7 +133,6 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
  */
 predicate localFlow(Node source, Node sink) { localFlowStep*(source, sink) }
 
-
 private newtype TContent =
   TFieldContent(Field f) or
   TCollectionContent() or
diff --git a/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll b/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll
index e2c9bd28505..5acdf5cd482 100644
--- a/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll
+++ b/ql/lib/semmle/go/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -114,7 +114,7 @@ class InterpretNode extends TInterpretNode {
   /** Gets the target of this call, if any. */
   Ident getCallTarget() {
     exists(Function f | f = this.asCall().getNode().(DataFlow::CallNode).getTarget() |
-    result = f.getDeclaration()
+      result = f.getDeclaration()
     )
   }