diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1cd0b9a..d87793d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - **aiken-lang**: allow implicitly discarded values when right-hand side unified with `Void`. @KtorZ
 - **aiken-lang**: allow zero arg mutually recursive functions. @Microproofs
 - **aiken-lang**: function aliases now resolved to the module and function name in codegen. @Microproofs
+- **aiken-lang**: fix indentation of pipelines to remain a multiple of the base indent increment. @KtorZ
 
 ### Changed
 
diff --git a/crates/aiken-lang/src/format.rs b/crates/aiken-lang/src/format.rs
index 8d0d8ad6..de8fb8c8 100644
--- a/crates/aiken-lang/src/format.rs
+++ b/crates/aiken-lang/src/format.rs
@@ -1244,7 +1244,7 @@ impl<'comments> Formatter<'comments> {
 
             let expr = self
                 .operator_side(doc, 4, expr.binop_precedence())
-                .nest(2 * INDENT + 1);
+                .nest(2 * INDENT);
 
             match printed_comments(comments, true) {
                 None => {
@@ -1842,11 +1842,7 @@ impl<'a> Documentable<'a> for &'a ArgName {
 }
 
 fn pub_(public: bool) -> Document<'static> {
-    if public {
-        "pub ".to_doc()
-    } else {
-        nil()
-    }
+    if public { "pub ".to_doc() } else { nil() }
 }
 
 impl<'a> Documentable<'a> for &'a UnqualifiedImport {
diff --git a/crates/aiken-lang/src/tests/snapshots/format_pipe_fn.snap b/crates/aiken-lang/src/tests/snapshots/format_pipe_fn.snap
index 6912566d..2d719b19 100644
--- a/crates/aiken-lang/src/tests/snapshots/format_pipe_fn.snap
+++ b/crates/aiken-lang/src/tests/snapshots/format_pipe_fn.snap
@@ -5,9 +5,8 @@ description: "Code:\n\nfn foo() {\n  outputs\n    |> list.any(\n    fn(output) {
 fn foo() {
   outputs
     |> list.any(
-         fn(output) {
-           value.quantity_of(output.value, policy_id, asset_name) == 1
-         },
-       )
+        fn(output) {
+          value.quantity_of(output.value, policy_id, asset_name) == 1
+        },
+      )
 }
-
diff --git a/examples/acceptance_tests/040/lib/tests.ak b/examples/acceptance_tests/040/lib/tests.ak
index c2067068..1522eec0 100644
--- a/examples/acceptance_tests/040/lib/tests.ak
+++ b/examples/acceptance_tests/040/lib/tests.ak
@@ -29,7 +29,7 @@ test expect_ford1() {
       ],
     )
   expect Ford { owner, wheels, truck_bed_limit, .. }: Car = initial_car
-  owner == #"" && wheels == 4 && truck_bed_limit == 10000
+  owner == #"" && ( wheels == 4 && truck_bed_limit == 10000 )
 }
 
 test expect_ford2() {
@@ -42,14 +42,14 @@ test expect_ford2() {
       car_doors: [],
     }
   expect Ford { owner, wheels, remote_connect, .. } = initial_car
-  owner == #"2222222222" && wheels == 6 && remote_connect == #""
+  owner == #"2222222222" && ( wheels == 6 && remote_connect == #"" )
 }
 
 test expect_list1() {
   let initial_car =
     [5, 6, 7]
   expect [a, b, c] = initial_car
-  a == 5 && b == 6 && c == 7
+  a == 5 && ( b == 6 && c == 7 )
 }
 
 test expect_list2() {
diff --git a/examples/acceptance_tests/067/lib/tests.ak b/examples/acceptance_tests/067/lib/tests.ak
index c4a66f5c..5ed56bd3 100644
--- a/examples/acceptance_tests/067/lib/tests.ak
+++ b/examples/acceptance_tests/067/lib/tests.ak
@@ -322,7 +322,7 @@ test get_proof_4() {
   let h1: ByteArray = get_proof_item_value(p1)
   let h2: ByteArray = get_proof_item_value(p2)
 
-  size_match && h1 == hash_fn(cat) && h2 == right_node_hash
+  size_match && ( h1 == hash_fn(cat) && h2 == right_node_hash )
 }
 
 fn do_from_list(
diff --git a/examples/acceptance_tests/098/lib/foo.ak b/examples/acceptance_tests/098/lib/foo.ak
index 42033c2a..5aaa5364 100644
--- a/examples/acceptance_tests/098/lib/foo.ak
+++ b/examples/acceptance_tests/098/lib/foo.ak
@@ -1,5 +1,6 @@
 fn label(str: String) -> Void {
-  trace str Void
+  trace str
+  Void
 }
 
 test foo() {