diff --git a/agora.cabal b/agora.cabal
index 0ace2a8..baa6b5c 100644
--- a/agora.cabal
+++ b/agora.cabal
@@ -152,13 +152,13 @@ test-suite agora-test
   main-is:        Spec.hs
   hs-source-dirs: agora-test
   other-modules:
+    Spec.AuthorityToken
     Spec.Effect.TreasuryWithdrawal
-    Spec.Sample.Effect.TreasuryWithdrawal
     Spec.Model.MultiSig
+    Spec.Sample.Effect.TreasuryWithdrawal
     Spec.Sample.Stake
     Spec.Stake
     Spec.Util
-    Spec.AuthorityToken
 
   build-depends:  agora
 
diff --git a/flake.nix b/flake.nix
index c6522d6..3b1756a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,8 +50,10 @@
 
       projectFor = system:
         let pkgs = nixpkgsFor system;
-        in let pkgs' = nixpkgsFor' system;
-        in (nixpkgsFor system).haskell-nix.cabalProject' {
+        in
+        let pkgs' = nixpkgsFor' system;
+        in
+        (nixpkgsFor system).haskell-nix.cabalProject' {
           src = ./.;
           compiler-nix-name = ghcVersion;
           inherit (plutarch) cabalProjectLocal;
@@ -120,16 +122,18 @@
             inherit (plutarch.tools) fourmolu;
           })
             fourmolu;
-        in pkgs.runCommand "format-check" {
-          nativeBuildInputs = [
-            pkgs'.git
-            pkgs'.fd
-            pkgs'.haskellPackages.cabal-fmt
-            pkgs'.nixpkgs-fmt
-            fourmolu
-            pkgs'.haskell.packages."${ghcVersion}".hlint
-          ];
-        } ''
+        in
+        pkgs.runCommand "format-check"
+          {
+            nativeBuildInputs = [
+              pkgs'.git
+              pkgs'.fd
+              pkgs'.haskellPackages.cabal-fmt
+              pkgs'.nixpkgs-fmt
+              fourmolu
+              pkgs'.haskell.packages."${ghcVersion}".hlint
+            ];
+          } ''
           export LC_CTYPE=C.UTF-8
           export LC_ALL=C.UTF-8
           export LANG=C.UTF-8
@@ -139,20 +143,23 @@
           mkdir $out
         '';
 
-    in {
+    in
+    {
       project = perSystem projectFor;
       flake = perSystem (system: (projectFor system).flake { });
 
       packages = perSystem (system:
         self.flake.${system}.packages // {
-          haddock = let
-            agora-doc = self.flake.${system}.packages."agora:lib:agora".doc;
-            pkgs = nixpkgsFor system;
-          in pkgs.runCommand "haddock-merge" { } ''
-            cd ${self}
-            mkdir $out
-            cp -r ${agora-doc}/share/doc/* $out
-          '';
+          haddock =
+            let
+              agora-doc = self.flake.${system}.packages."agora:lib:agora".doc;
+              pkgs = nixpkgsFor system;
+            in
+            pkgs.runCommand "haddock-merge" { } ''
+              cd ${self}
+              mkdir $out
+              cp -r ${agora-doc}/share/doc/* $out
+            '';
         });
 
       # Define what we want to test
@@ -163,9 +170,10 @@
           agora-test = self.flake.${system}.packages."agora:test:agora-test";
         });
       check = perSystem (system:
-        (nixpkgsFor system).runCommand "combined-test" {
-          checksss = builtins.attrValues self.checks.${system};
-        } ''
+        (nixpkgsFor system).runCommand "combined-test"
+          {
+            checksss = builtins.attrValues self.checks.${system};
+          } ''
           echo $checksss
           touch $out
         '');