diff --git a/package.json b/package.json
index 9de4be4d..48b211ae 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "format": "prettier --write src/**.sol src/utils/**.sol src/utils/interfaces/**.sol src/extensions/dao/**.sol src/extensions/dao/utils/**.sol src/extensions/metadata/**.sol src/extensions/mint/**.sol src/extensions/storage/**.sol src/extensions/utils/**.sol test/**.sol test/utils/mocks/**.sol flat/**.sol --plugin-search-dir=.",
+    "format": "prettier --write --plugin=prettier-plugin-solidity 'src/**/*.sol' 'test/**/*.sol' 'flat/**/*.sol'",
     "format:list": "prettier --list-different 'src/**/*.sol'",
     "format:check": "prettier --check 'src/**/*.sol'",
     "solhint": "solhint --config ./.solhint.json 'src/**/*.sol' --fix --ignore-path .solhintignore",
diff --git a/src/Keep.sol b/src/Keep.sol
index 84829a4f..e69e269c 100644
--- a/src/Keep.sol
+++ b/src/Keep.sol
@@ -464,8 +464,8 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
         bytes calldata sig
     ) public view virtual returns (bytes4) {
         // Check `SIGN_KEY` as this denotes ownership.
-        if (_validate(hash, sig, SIGN_KEY) == 0) 
-            return 0x1626ba7e; else return 0xffffffff;
+        if (_validate(hash, sig, SIGN_KEY) == 0) return 0x1626ba7e;
+        else return 0xffffffff;
     }
 
     /// -----------------------------------------------------------------------
@@ -480,8 +480,8 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
         bytes32 hash,
         bytes calldata sig
     ) public view virtual returns (bytes4) {
-        if (_validate(hash, sig, id) == 0) 
-            return 0x12edb34f; else return 0xffffffff;
+        if (_validate(hash, sig, id) == 0) return 0x12edb34f;
+        else return 0xffffffff;
     }
 
     /// -----------------------------------------------------------------------
@@ -514,11 +514,7 @@ contract Keep is ERC1155TokenReceiver, KeepToken, Multicallable {
                 missingAccountFunds
             );
         } else {
-            validationData = _validate(
-                userOpHash,
-                userOp.signature,
-                SIGN_KEY
-            );
+            validationData = _validate(userOpHash, userOp.signature, SIGN_KEY);
         }
 
         // Send any missing funds to `entrypoint()` (msg.sender).
diff --git a/src/extensions/validate/URIRemoteFetcher.sol b/src/extensions/validate/URIRemoteFetcher.sol
index 78a1f62c..dca14be6 100644
--- a/src/extensions/validate/URIRemoteFetcher.sol
+++ b/src/extensions/validate/URIRemoteFetcher.sol
@@ -7,7 +7,10 @@ contract URIRemoteFetcher {
 
     constructor() payable {}
 
-    function uri(address origin, uint256 id) public view virtual returns (string memory) {
+    function uri(
+        address origin,
+        uint256 id
+    ) public view virtual returns (string memory) {
         return
             string(
                 abi.encodePacked(
diff --git a/src/extensions/validate/Validator.sol b/src/extensions/validate/Validator.sol
index 57948c97..3d7e22ae 100644
--- a/src/extensions/validate/Validator.sol
+++ b/src/extensions/validate/Validator.sol
@@ -3,7 +3,8 @@ pragma solidity ^0.8.4;
 
 import {Ownable} from "../../utils/Ownable.sol";
 import {UserOperation} from "../../Keep.sol";
-function getURI(address,uint256) returns (string memory) {}
+
+function getURI(address, uint256) returns (string memory) {}
 
 /// @notice Open-ended metadata for ERC1155 and ERC4337 permission fetching.
 contract Validator is Ownable(tx.origin) {
@@ -67,7 +68,10 @@ contract Validator is Ownable(tx.origin) {
     /// -----------------------------------------------------------------------
     /// URI Remote Logic
     /// -----------------------------------------------------------------------
-    function uri(address, uint256) public view virtual returns (string memory) {}
+    function uri(
+        address,
+        uint256
+    ) public view virtual returns (string memory) {}
 
     function uri(uint256 id) public view virtual returns (string memory) {
         return uriRemoteValidator.uri(msg.sender, id);