diff --git a/src/EncumberableToken.sol b/src/EncumberableToken.sol
index 3915030..e47d33a 100644
--- a/src/EncumberableToken.sol
+++ b/src/EncumberableToken.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.15;
 
-import "./vendor/ERC20.sol";
-import "./vendor/IERC20Metadata.sol";
-import "./vendor/IERC20Permit.sol";
-import "./interfaces/IERC20NonStandard.sol";
-import "./interfaces/IERC7246.sol";
+import { ERC20 } from "./vendor/ERC20.sol";
+import { IERC20Metadata } from "./vendor/IERC20Metadata.sol";
+import { IERC20Permit } from "./vendor/IERC20Permit.sol";
+import { IERC20NonStandard } from "./interfaces/IERC20NonStandard.sol";
+import { IERC7246 } from "./interfaces/IERC7246.sol";
 
 /**
  * @title EncumberableToken
diff --git a/src/EncumberableTokenFactory.sol b/src/EncumberableTokenFactory.sol
index 4b1467e..2f1c500 100644
--- a/src/EncumberableTokenFactory.sol
+++ b/src/EncumberableTokenFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.15;
 
-import "./EncumberableToken.sol";
+import { EncumberableToken } from "./EncumberableToken.sol";
 
 /**
  * @title EncumberableTokenFactory
diff --git a/test/EncumberBySig.t.sol b/test/EncumberBySig.t.sol
index d6e4df8..4d16640 100644
--- a/test/EncumberBySig.t.sol
+++ b/test/EncumberBySig.t.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.8.15;
 
-import "forge-std/Test.sol";
 import "forge-std/StdUtils.sol";
-import "../src/vendor/ERC20.sol";
-import "../src/vendor/IERC20Metadata.sol";
-import "../src/EncumberableToken.sol";
+import { Test } from "forge-std/Test.sol";
+import { ERC20 } from "../src/vendor/ERC20.sol";
+import { IERC20Metadata } from "../src/vendor/IERC20Metadata.sol";
+import { EncumberableToken } from "../src/EncumberableToken.sol";
 
 contract EncumberBySigTest is Test {
     ERC20 public underlyingToken;
diff --git a/test/EncumberableToken.t.sol b/test/EncumberableToken.t.sol
index b6c20f5..683b025 100644
--- a/test/EncumberableToken.t.sol
+++ b/test/EncumberableToken.t.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.8.15;
 
-import "forge-std/Test.sol";
 import "forge-std/StdUtils.sol";
-import "../src/vendor/ERC20.sol";
-import "../src/vendor/IERC20Metadata.sol";
-import "../src/EncumberableToken.sol";
+import { Test } from "forge-std/Test.sol";
+import { ERC20 } from "../src/vendor/ERC20.sol";
+import { IERC20Metadata } from "../src/vendor/IERC20Metadata.sol";
+import { EncumberableToken } from "../src/EncumberableToken.sol";
 
 contract EncumberableTokenTest is Test {
     event Encumber(address indexed owner, address indexed taker, uint amount);
diff --git a/test/EncumberableTokenFactory.t.sol b/test/EncumberableTokenFactory.t.sol
index e1df597..d0f74c2 100644
--- a/test/EncumberableTokenFactory.t.sol
+++ b/test/EncumberableTokenFactory.t.sol
@@ -1,10 +1,9 @@
 pragma solidity ^0.8.15;
 
-import "forge-std/Test.sol";
-import "../src/EncumberableTokenFactory.sol";
-import "../src/vendor/ERC20.sol";
-import "../src/vendor/IERC20Metadata.sol";
-
+import { Test } from "forge-std/Test.sol";
+import { EncumberableTokenFactory } from "../src/EncumberableTokenFactory.sol";
+import { ERC20 } from "../src/vendor/ERC20.sol";
+import { IERC20Metadata } from "../src/vendor/IERC20Metadata.sol";
 
 contract EncumberableTokenFactoryTest is Test {
     EncumberableTokenFactory public wrapperFactory;
diff --git a/test/Permit.t.sol b/test/Permit.t.sol
index b5d4d24..96d7c19 100644
--- a/test/Permit.t.sol
+++ b/test/Permit.t.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.8.15;
 
-import "forge-std/Test.sol";
 import "forge-std/StdUtils.sol";
-import "../src/vendor/ERC20.sol";
-import "../src/vendor/IERC20Metadata.sol";
-import "../src/EncumberableToken.sol";
+import { Test } from "forge-std/Test.sol";
+import { ERC20 } from "../src/vendor/ERC20.sol";
+import { IERC20Metadata } from "../src/vendor/IERC20Metadata.sol";
+import { EncumberableToken } from "../src/EncumberableToken.sol";
 
 contract PermitTest is Test {
     ERC20 public underlyingToken;