diff --git a/app/code/community/Gene/Braintree/Helper/Data.php b/app/code/community/Gene/Braintree/Helper/Data.php
index 1144e53..9a9e752 100644
--- a/app/code/community/Gene/Braintree/Helper/Data.php
+++ b/app/code/community/Gene/Braintree/Helper/Data.php
@@ -100,26 +100,18 @@ public function convertToBraintreeAddress($address)
                 'firstName'         => $address->getFirstname(),
                 'lastName'          => $address->getLastname(),
                 'streetAddress'     => $address->getStreet1(),
+                'extendedAddress'   => $address->getStreet2(),
+                'company'           => $address->getCompany(),
                 'locality'          => $address->getCity(),
                 'postalCode'        => $address->getPostcode(),
                 'countryCodeAlpha2' => $address->getCountry()
             );
 
-            // Any extended address?
-            if ($address->getStreet2()) {
-                $return['extendedAddress'] = $address->getStreet2();
-            }
-
             // Region
             if ($address->getRegion()) {
                 $return['region'] = $address->getRegionCode();
             }
 
-            // Check to see if we have a company
-            if ($address->getCompany()) {
-                $return['company'] = $address->getCompany();
-            }
-
             return $return;
         }
     }