diff --git a/contracts/coordinator/test/coordinator.ts b/contracts/coordinator/test/coordinator.ts
index 9e6004583c..408efcce8d 100644
--- a/contracts/coordinator/test/coordinator.ts
+++ b/contracts/coordinator/test/coordinator.ts
@@ -517,3 +517,4 @@ describe('Coordinator tests', () => {
         });
     });
 });
+// tslint:disable:max-file-line-count
diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
index 25825828cb..8b2d28b03e 100644
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -5,6 +5,10 @@
             {
                 "note": "Set evmVersion to byzantium",
                 "pr": 1678
+            },
+            {
+                "note": "Optimize loops in LibAddressArray",
+                "pr": 1668
             }
         ]
     },
diff --git a/contracts/utils/contracts/src/LibAddressArray.sol b/contracts/utils/contracts/src/LibAddressArray.sol
index 68f459ac29..531105a189 100644
--- a/contracts/utils/contracts/src/LibAddressArray.sol
+++ b/contracts/utils/contracts/src/LibAddressArray.sol
@@ -99,19 +99,21 @@ library LibAddressArray {
             let arrayByteLen := mul(mload(addressArray), 32)
             // Calculate beginning of array contents
             let arrayContentsStart := add(addressArray, 32)
+            // Calclulate end of array contents
+            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
 
             // Loop through array
-            for {let i:= 0} lt(i, arrayByteLen) {i := add(i, 32)} {
+            for {let i:= arrayContentsStart} lt(i, arrayContentsEnd) {i := add(i, 32)} {
 
                 // Load array element
-                let arrayElement := mload(add(arrayContentsStart, i))
+                let arrayElement := mload(i)
 
                 // Return true if array element equals target
                 if eq(target, arrayElement) {
                     // Set success to true
                     success := 1
                     // Break loop
-                    i := arrayByteLen
+                    i := arrayContentsEnd
                 }
             }
         }
@@ -133,12 +135,14 @@ library LibAddressArray {
             let arrayByteLen := mul(mload(addressArray), 32)
             // Calculate beginning of array contents
             let arrayContentsStart := add(addressArray, 32)
+            // Calclulate end of array contents
+            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
 
             // Loop through array
-            for {let i:= 0} lt(i, arrayByteLen) {i := add(i, 32)} {
+            for {let i:= arrayContentsStart} lt(i, arrayContentsEnd) {i := add(i, 32)} {
 
                 // Load array element
-                let arrayElement := mload(add(arrayContentsStart, i))
+                let arrayElement := mload(i)
 
                 // Return true if array element equals target
                 if eq(target, arrayElement) {
@@ -146,7 +150,7 @@ library LibAddressArray {
                     success := 1
                     index := div(i, 32)
                     // Break loop
-                    i := arrayByteLen
+                    i := arrayContentsEnd
                 }
             }
         }