diff --git a/Helper/UsstateMapHelper.php b/Helper/UsstateMapHelper.php
index c310761..7703595 100644
--- a/Helper/UsstateMapHelper.php
+++ b/Helper/UsstateMapHelper.php
@@ -12,24 +12,46 @@ class UsstateMapHelper
 {
     public static function getMap()
     {
-        return ['AL' => 'Alabama', 'AK' => 'Alaska', 'AZ' => 'Arizona', 'AR' => 'Arkansas', 'CA' => 'California',
-        'CO'         => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware', 'FL' => 'Florida', 'GA' => 'Georgia',
-        'HI'         => 'Hawaii', 'ID' => 'Idaho', 'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa',
-        'KS'         => 'Kansas', 'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine', 'MD' => 'Maryland',
-        'MA'         => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi', 'MO' => 'Missouri',
-        'MT'         => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada', 'NH' => 'New Hampshire', 'NJ' => 'New Jersey',
-        'NM'         => 'New Mexico', 'NY' => 'New York', 'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio',
-        'OK'         => 'Oklahoma', 'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina',
-        'SD'         => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah', 'VT' => 'Vermont',
-        'VA'         => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia', 'WI' => 'Wisconsin', 'WY' => 'Wyoming', ];
+        return [
+            'AL' => 'Alabama',          'AK' => 'Alaska',
+            'AZ' => 'Arizona',          'AR' => 'Arkansas',
+            'CA' => 'California',       'CO' => 'Colorado',
+            'CT' => 'Connecticut',      'DE' => 'Delaware',
+            'FL' => 'Florida',          'GA' => 'Georgia',
+            'HI' => 'Hawaii',           'ID' => 'Idaho',
+            'IL' => 'Illinois',         'IN' => 'Indiana',
+            'IA' => 'Iowa',             'KS' => 'Kansas',
+            'KY' => 'Kentucky',         'LA' => 'Louisiana',
+            'ME' => 'Maine',            'MD' => 'Maryland',
+            'MA' => 'Massachusetts',    'MI' => 'Michigan',
+            'MN' => 'Minnesota',        'MS' => 'Mississippi',
+            'MO' => 'Missouri',         'MT' => 'Montana',
+            'NE' => 'Nebraska',         'NV' => 'Nevada',
+            'NH' => 'New Hampshire',    'NJ' => 'New Jersey',
+            'NM' => 'New Mexico',       'NY' => 'New York',
+            'NC' => 'North Carolina',   'ND' => 'North Dakota',
+            'OH' => 'Ohio',             'OK' => 'Oklahoma',
+            'OR' => 'Oregon',           'PA' => 'Pennsylvania',
+            'RI' => 'Rhode Island',     'SC' => 'South Carolina',
+            'SD' => 'South Dakota',     'TN' => 'Tennessee',
+            'TX' => 'Texas',            'UT' => 'Utah',
+            'VT' => 'Vermont',          'VA' => 'Virginia',
+            'WA' => 'Washington',       'WV' => 'West Virginia',
+            'WI' => 'Wisconsin',        'WY' => 'Wyoming', ];
     }
 
     /**
-     * @return array|null
+     * @return array
      */
     public static function getStateOptions()
     {
-        return array_flip(static::getMap());
+        $options = [];
+        foreach (self::getMap() as $key => $value) {
+            $options[$key]   = $key;
+            $options[$value] = $key;
+        }
+
+        return $options;
     }
 
     /**