diff --git a/src/mappings/datatoken.ts b/src/mappings/datatoken.ts
index de21f54..06f44f8 100644
--- a/src/mappings/datatoken.ts
+++ b/src/mappings/datatoken.ts
@@ -69,7 +69,7 @@ export function handleTransfer(event: Transfer): void {
   }
 
   if (
-    tokenBalanceTo !== null &&
+    tokenBalanceTo != null &&
     tokenBalanceTo.balance.notEqual(ZERO_BD) &&
     oldBalanceTo.equals(ZERO_BD)
   ) {
@@ -77,7 +77,7 @@ export function handleTransfer(event: Transfer): void {
   }
 
   if (
-    tokenBalanceFrom !== null &&
+    tokenBalanceFrom != null &&
     tokenBalanceFrom.balance.equals(ZERO_BD) &&
     oldBalanceFrom.notEqual(ZERO_BD)
   ) {
@@ -115,7 +115,7 @@ export function handleOrderStarted(event: OrderStarted): void {
   order.timestamp = event.params.timestamp.toI32()
   if (
     event.params.mrktFeeCollector != null &&
-    event.params.mrktFeeCollector.toHex() !== ZERO_ADDRESS
+    event.params.mrktFeeCollector.toHex() != ZERO_ADDRESS
   ) {
     order.marketFeeCollector = event.params.mrktFeeCollector.toHexString()
   }
diff --git a/src/mappings/pool.ts b/src/mappings/pool.ts
index a3c8f9e..7a74a5a 100644
--- a/src/mappings/pool.ts
+++ b/src/mappings/pool.ts
@@ -86,7 +86,7 @@ export function _handleRebind(
   const pool = Pool.load(poolId)
   const decimals = BigInt.fromI32(18).toI32()
 
-  if (tokenAddress !== OCEAN) {
+  if (tokenAddress != OCEAN) {
     pool.datatokenAddress = tokenAddress
   }
   pool.tokenCount += BigInt.fromI32(1)
@@ -470,7 +470,7 @@ export function handleTransfer(event: Transfer): void {
   }
 
   if (
-    poolShareTo !== null &&
+    poolShareTo != null &&
     poolShareTo.balance.notEqual(ZERO_BD) &&
     poolShareToBalance.equals(ZERO_BD)
   ) {
@@ -478,7 +478,7 @@ export function handleTransfer(event: Transfer): void {
   }
 
   if (
-    poolShareFrom !== null &&
+    poolShareFrom != null &&
     poolShareFrom.balance.equals(ZERO_BD) &&
     poolShareFromBalance.notEqual(ZERO_BD)
   ) {