diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa54213..c391388 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Un-released
 
+## 2019-08-20
+
+### Fix
+
+- Checkout validation parcelshop locator bugfixed [@timoj](https://github.com/timoj)  [WWE-97](https://wuunder.atlassian.net/secure/RapidBoard.jspa?rapidView=6&projectKey=WWE&modal=detail&selectedIssue=WWE-97)
+- Code styling [@timoj](https://github.com/timoj)  [WWE-97](https://wuunder.atlassian.net/secure/RapidBoard.jspa?rapidView=6&projectKey=WWE&modal=detail&selectedIssue=WWE-97)
+
 ## Released 
 
 ## [2.7.0](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.0) - 2019-04-01
diff --git a/assets/js/parcelshop.js b/assets/js/parcelshop.js
index 03534bd..7e18f63 100644
--- a/assets/js/parcelshop.js
+++ b/assets/js/parcelshop.js
@@ -3,6 +3,7 @@ var parcelshopShippingMethodElem = document.getElementById('shipping_method_0_wu
 
 var shippingAddress;
 var parcelshopAddress;
+var rawParcelshopAddress;
 
 var baseUrl;
 var baseUrlApi;
@@ -45,6 +46,7 @@ function _printParcelshopAddress() {
         currentParcelshop.className += 'parcelshopInfo';
         currentParcelshop.innerHTML = '<br/><strong>Ophalen in parcelshop:</strong><br/>' + parcelshopAddress;
         window.parent.document.getElementById('parcelshopsSelectedContainer').appendChild(currentParcelshop);
+        window.parent.document.getElementById('parcelshop_country').value = rawParcelshopAddress.address.alpha2;
     }
 }
 
@@ -52,8 +54,10 @@ function _printParcelshopAddress() {
 function _showParcelshopLocator() {
     var address = "";
 
-    jQuery.post( baseUrl + "admin-ajax.php", {action: 'wuunder_parcelshoplocator_get_address', address: address}, function( data ) {
-        console.log(data);
+    jQuery.post(baseUrl + "admin-ajax.php", {
+        action: 'wuunder_parcelshoplocator_get_address',
+        address: address
+    }, function (data) {
         shippingAddress = data;
         _openIframe();
     });
@@ -105,12 +109,15 @@ function _openIframe() {
 }
 
 function _loadSelectedParcelshopAddress(id) {
-    jQuery.post( baseUrl + "admin-ajax.php", {action: 'wuunder_parcelshoplocator_get_parcelshop_address', parcelshop_id: id}, function( data ) {
+    jQuery.post(baseUrl + "admin-ajax.php", {
+        action: 'wuunder_parcelshoplocator_get_parcelshop_address',
+        parcelshop_id: id
+    }, function (data) {
         data = JSON.parse(data);
+        rawParcelshopAddress = data;
         var parcelshopInfoHtml = _capFirst(data.company_name) + "<br>" + _capFirst(data.address.street_name) +
             " " + data.address.house_number + "<br>" + data.address.city;
         parcelshopInfoHtml = parcelshopInfoHtml.replace(/"/g, '\\"').replace(/'/g, "\\'");
-        console.log(parcelshopInfoHtml);
         parcelshopAddress = parcelshopInfoHtml;
         _printParcelshopAddress();
     });
diff --git a/includes/checkout.php b/includes/checkout.php
index 87ca381..cd36303 100644
--- a/includes/checkout.php
+++ b/includes/checkout.php
@@ -3,11 +3,11 @@
     exit;
 } // Exit if accessed directly
 
-add_action('wp_enqueue_scripts', 'callback_for_setting_up_scripts');
+add_action('wp_enqueue_scripts', 'wcwp_callback_for_setting_up_scripts');
 // add_action('woocommerce_review_order_before_submit', 'parcelshop_html');
 add_action('woocommerce_review_order_after_submit', 'parcelshop_html');
 
-function callback_for_setting_up_scripts() {
+function wcwp_callback_for_setting_up_scripts() {
     if ( class_exists('WC_wuunder_parcelshop' ) ) {
         $style_file = dirname ( plugin_dir_url( __FILE__ ) ) . '/assets/css/parcelshop.css';
         $google_api_key = get_option( 'wc_wuunder_google_maps_api_key' );
@@ -21,7 +21,7 @@ function callback_for_setting_up_scripts() {
 }
 
 
-function parcelshop_html()
+function wcwp_parcelshop_html()
 {
     $pluginPath = dirname(plugin_dir_url(__FILE__));
     $pluginPathJS = $pluginPath . "/assets/js/parcelshop.js";
@@ -30,11 +30,13 @@ function parcelshop_html()
     $tmpEnvironment = new \Wuunder\Api\Environment(get_option('wc_wuunder_api_status') === 'staging' ? 'staging' : 'production');
 
     $baseApiUrl = substr($tmpEnvironment->getStageBaseUrl(), 0, -3);
-    $carrierList = implode(',', get_option('woocommerce_wuunder_parcelshop_settings')['select_carriers']);
+    $carrierConfigList = get_option('woocommerce_wuunder_parcelshop_settings')['select_carriers'] ? get_option('woocommerce_wuunder_parcelshop_settings')['select_carriers'] : [];
+    $carrierList = implode(',', $carrierConfigList);
     if ( 0 !== strlen($carrierList)  ) {
         $availableCarriers = $carrierList;
     } else {
-        $availableCarriers = implode(',', array_keys(get_option('default_carrier_list')));
+        $defaultCarrierConfig = get_option('default_carrier_list') ? get_option('default_carrier_list') : [];
+        $availableCarriers = implode(',', array_keys($defaultCarrierConfig));
     }
 
     echo <<<EOT
@@ -46,8 +48,8 @@ function parcelshop_html()
 }
 
 // Field added for the parcelshop_id, so that it can be requested from backend
-add_action( 'woocommerce_after_order_notes', 'add_parcelshop_id_field' );
-function add_parcelshop_id_field( $checkout ) {
+add_action( 'woocommerce_after_order_notes', 'wcwp_add_parcelshop_id_field' );
+function wcwp_add_parcelshop_id_field($checkout ) {
     woocommerce_form_field('parcelshop_id', array(
         'type' => 'text',
         'class' => array(
@@ -64,28 +66,24 @@ function add_parcelshop_id_field( $checkout ) {
 }
 
 // Save / Send the parcelshop id
-add_action( 'woocommerce_checkout_update_order_meta', 'update_parcelshop_id' );
-function update_parcelshop_id( $order_id ) {
+add_action( 'woocommerce_checkout_update_order_meta', 'wcwp_update_parcelshop_id' );
+function wcwp_update_parcelshop_id( $order_id ) {
     if ( ! empty( $_POST['parcelshop_id'] ) ) {
         update_post_meta( $order_id, 'parcelshop_id', sanitize_text_field( $_POST['parcelshop_id'] ) );
     }
 }
 
-//<<<<<<< HEAD
-//// Check to see if a parcelshop is selected when parcel method is selected && Check if shipping country == parcelshop country
-//add_action( 'woocommerce_checkout_process', 'check_parcelshop_selection' );
-//function check_parcelshop_selection() {
-//    if ( 'wuunder_parcelshop' === $_POST['shipping_method'][0] ) {
-//        if ( !$_POST['parcelshop_id'] ) {
-//            wc_add_notice( __( 'Kies eerst een <strong>parcelshop</strong>' ), 'error' );
-//        }
-//
-//        if ( $_POST['shipping_country'] != $_POST['parcelshop_country'] ) {
-//            wc_add_notice( __( 'Het <strong>land van de verzendgegevens</strong> moet overeenkomen met het <strong>land van de parcelshop</strong>' ), 'error' );
-//        }
-//    }
-//}
-//
-//=======
-//>>>>>>> f4bbe1748e986e61957972fe442458b9c2dfccc8
+// Check to see if a parcelshop is selected when parcel method is selected && Check if shipping country == parcelshop country
+add_action( 'woocommerce_checkout_process', 'wcwp_check_parcelshop_selection' );
+function wcwp_check_parcelshop_selection() {
+    if ( 'wuunder_parcelshop' === $_POST['shipping_method'][0] ) {
+        if ( !$_POST['parcelshop_id'] ) {
+            wc_add_notice( __( 'Kies eerst een <strong>parcelshop</strong>' ), 'error' );
+        }
+
+        if ( $_POST['shipping_country'] != $_POST['parcelshop_country'] ) {
+            wc_add_notice( __( 'Het <strong>land van de verzendgegevens</strong> moet overeenkomen met het <strong>land van de parcelshop</strong> '), 'error' );
+        }
+    }
+}
 ?>
diff --git a/includes/logger.php b/includes/logger.php
index 8f1b3ca..c8bc9b2 100644
--- a/includes/logger.php
+++ b/includes/logger.php
@@ -1,6 +1,6 @@
 <?php
 
-function wuunder_log($severity, $message ) {
+function wcwp_log($severity, $message ) {
     $logger = wc_get_logger();
     $context = array( 'source' => 'wuunder_connector' );
     if ( WP_DEBUG ) {
diff --git a/includes/parcelshop.php b/includes/parcelshop.php
index ed1768d..35c0296 100644
--- a/includes/parcelshop.php
+++ b/includes/parcelshop.php
@@ -1,6 +1,6 @@
 <?php
 
-function parcelShopLocator()
+function wcwp_parcelShopLocator()
 {
     include_once( 'wcwuunder-shipping-method.php' );
 //    error_reporting(E_ALL);
@@ -41,7 +41,7 @@ function parcelShopLocator()
 }
 
 
-function getAddress() {
+function wcwp_getAddress() {
     $shipping_address = null;
 
     if(!empty($_POST['address'])) {
@@ -58,7 +58,7 @@ function getAddress() {
     exit;
 }
 
-function getParcelshopAddress() {
+function wcwp_getParcelshopAddress() {
     $shipping_address = null;
 
     if(empty($_POST['parcelshop_id'])) {
diff --git a/includes/wcwuunder-admin.php b/includes/wcwuunder-admin.php
index 0da352e..157e625 100644
--- a/includes/wcwuunder-admin.php
+++ b/includes/wcwuunder-admin.php
@@ -20,8 +20,8 @@ public function init_admin() {
 				return;
 			}
 
-			require_once( WW_PLUGIN_ADMIN_DIR . '/wcwuunder-settings.php' );
-			require_once( WW_PLUGIN_ADMIN_DIR . '/wcwuunder-create.php' );
+			require_once( WCWP_PLUGIN_ADMIN_DIR . '/wcwuunder-settings.php' );
+			require_once( WCWP_PLUGIN_ADMIN_DIR . '/wcwuunder-create.php' );
 
 		}
 		
diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php
index e894e48..ecfa1b5 100644
--- a/includes/wcwuunder-create.php
+++ b/includes/wcwuunder-create.php
@@ -18,18 +18,17 @@ public function __construct() {
                     'name'      => 'Woocommerce',
                     'build'     => WC()->version
                 ) );
-            add_action( 'load-edit.php', array(&$this, 'generateBookingUrl' ) );
-            add_action( 'load-edit.php', array(&$this, 'test' ) );
-            add_action( 'woocommerce_admin_order_actions_end', array( &$this, 'add_listing_actions' ) );
-            add_action( 'add_meta_boxes_shop_order', array( &$this, 'add_meta_boxes' ) );
-            add_action( 'admin_notices', array( &$this, 'sample_admin_notice__error' ) );
+            add_action( 'load-edit.php', array(&$this, 'wcwp_generateBookingUrl' ) );
+            add_action( 'woocommerce_admin_order_actions_end', array( &$this, 'wcwp_add_listing_actions' ) );
+            add_action( 'add_meta_boxes_shop_order', array( &$this, 'wcwp_add_meta_boxes' ) );
+            add_action( 'admin_notices', array( &$this, 'wcwp_sample_admin_notice__error' ) );
             wp_enqueue_style( 'wuunder-admin', ( dirname( plugin_dir_url( __FILE__ ) ) . '/assets/css/wuunder-admin.css' ) );
         }
 
         /**
          * Creates an error message for the admin order page
          */
-        public function sample_admin_notice__error() {
+        public function wcwp_sample_admin_notice__error() {
 
             if ( 'error' == isset( $_GET['notice'] ) && $_GET['notice'] ) {
 
@@ -60,10 +59,10 @@ public function sample_admin_notice__error() {
          * @param $orderId
          * @return $bookingConfig
          */
-        private function setBookingConfig( $orderId ) {
-            wuunder_log( 'info', 'Filling the booking config' );
+        private function wcwp_setBookingConfig($orderId ) {
+            wcwp_log( 'info', 'Filling the booking config' );
             
-            $orderItems = $this->get_order_items( $orderId );
+            $orderItems = $this->wcwp_get_order_items( $orderId );
 
             $order = new WC_Order( $orderId );
             $orderPicture = null;
@@ -79,15 +78,15 @@ private function setBookingConfig( $orderId ) {
             if (is_null($orderPicture ) ) {
                 foreach ( $orderItems['images'] as $image ) {
                     if ( !is_null( $image ) ) {
-                        $orderPicture = $this->get_base64_image( $image );
+                        $orderPicture = $this->wcwp_get_base64_image( $image );
                         break;
                     }
                 }
             }
 
             // Get WooCommerce Wuunder Address from options page
-            $company = $this->get_company_address();
-            $customer = $this->get_customer_address( $orderId );
+            $company = $this->wcwp_get_company_address();
+            $customer = $this->wcwp_get_customer_address( $orderId );
 
             $totalWeight = 0;
             $dimensions = null;
@@ -124,12 +123,12 @@ private function setBookingConfig( $orderId ) {
             $bookingConfig->setPicture( $orderPicture );
             $bookingConfig->setKind( $totalWeight > 23000 ? 'pallet' : 'package' );
             $bookingConfig->setValue( $value ? $value : null );
-            $bookingConfig->setLength( $this->roundButNull( $dimensions[0] ) );
-            $bookingConfig->setWidth( $this->roundButNull( $dimensions[1] ) );
-            $bookingConfig->setHeight( $this->roundButNull( $dimensions[2] ) );
+            $bookingConfig->setLength( $this->wcwp_roundButNull( $dimensions[0] ) );
+            $bookingConfig->setWidth( $this->wcwp_roundButNull( $dimensions[1] ) );
+            $bookingConfig->setHeight( $this->wcwp_roundButNull( $dimensions[2] ) );
             $bookingConfig->setWeight( $totalWeight ? $totalWeight : null );
             $bookingConfig->setCustomerReference( $orderId );
-            $bookingConfig->setPreferredServiceLevel((count( $order->get_items( 'shipping' ) ) > 0) ? $this->get_filter_from_shippingmethod( reset( $order->get_items( 'shipping' ) )->get_method_id() ) : '' );
+            $bookingConfig->setPreferredServiceLevel((count( $order->get_items( 'shipping' ) ) > 0) ? $this->wcwp_get_filter_from_shippingmethod( reset( $order->get_items( 'shipping' ) )->get_method_id() ) : '' );
             $bookingConfig->setSource( $this->version_obj );
 
             $orderMeta = get_post_meta( $orderId );
@@ -147,9 +146,9 @@ private function setBookingConfig( $orderId ) {
          * Generates the booking url that takes the user to Wuunder.
          * Returns the user to the original order page with the redirect.
          */
-        public function generateBookingUrl() {
+        public function wcwp_generateBookingUrl() {
             if (isset($_REQUEST['order']) && $_REQUEST['action'] === "bookorder") {
-                wuunder_log( 'info', 'Generating the booking url' );
+                wcwp_log( 'info', 'Generating the booking url' );
                 $order_id = $_REQUEST['order'];
 
                 $status = get_option( 'wc_wuunder_api_status' );
@@ -158,21 +157,21 @@ public function generateBookingUrl() {
 
                 $connector = new Wuunder\Connector( $apiKey, 'productie' !== $status );
                 $booking = $connector->createBooking();
-                $bookingConfig = $this->setBookingConfig( $order_id );
+                $bookingConfig = $this->wcwp_setBookingConfig( $order_id );
 
                 if ( $bookingConfig->validate() ) {
                     $booking->setConfig( $bookingConfig );
-                    wuunder_log( 'info', 'Going to fire for bookingurl' );
+                    wcwp_log( 'info', 'Going to fire for bookingurl' );
                     if ( $booking->fire() ) {
                         $url = $booking->getBookingResponse()->getBookingUrl();
                     } else {
-                        wuunder_log( 'error', $booking->getBookingResponse()->getError() );
+                        wcwp_log( 'error', $booking->getBookingResponse()->getError() );
                     }
                 } else {
-                    wuunder_log( 'error', 'Bookingconfig not complete' );
+                    wcwp_log( 'error', 'Bookingconfig not complete' );
                 }
 
-                wuunder_log( 'info', 'Handling response' );
+                wcwp_log( 'info', 'Handling response' );
 
                 if  (isset( $url ) ) {
                     update_post_meta( $order_id, '_wuunder_label_booking_url', $url );
@@ -184,16 +183,13 @@ public function generateBookingUrl() {
             }
         }
 
-        public function test() {
-        }
-
         /**
          * Returns rounded value, or null
          *
          * @param $val
          * @return float|null
          */
-        private function roundButNull( $val ) {
+        private function wcwp_roundButNull($val ) {
             if ( empty( $val ) ) {
                 return null;
             }
@@ -207,7 +203,7 @@ private function roundButNull( $val ) {
          * @param $shipping_method
          * @return
          */
-        private function get_filter_from_shippingmethod( $shipping_method ) {
+        private function wcwp_get_filter_from_shippingmethod($shipping_method ) {
             if ( false !== strpos( $shipping_method, ':' ) ) {
                 $shipping_method = explode( ':', $shipping_method )[0];
             }
@@ -229,7 +225,7 @@ private function get_filter_from_shippingmethod( $shipping_method ) {
          *
          * @return $pickupAddress
          */
-        public function get_company_address() {
+        public function wcwp_get_company_address() {
             $pickupAddress = new \Wuunder\Api\Config\AddressConfig();
             $pickupAddress->setEmailAddress(get_option( 'wc_wuunder_company_email' ) );
             $pickupAddress->setFamilyName(get_option( 'wc_wuunder_company_lastname' ) );
@@ -244,7 +240,7 @@ public function get_company_address() {
             if ( $pickupAddress->validate() ) {
                 return $pickupAddress;
             } else {
-                wuunder_log( 'error', 'Invalid pickup address. There are mistakes or missing fields.' );
+                wcwp_log( 'error', 'Invalid pickup address. There are mistakes or missing fields.' );
                 return $pickupAddress;
             }
         }
@@ -255,7 +251,7 @@ public function get_company_address() {
          * @param $addressLine
          * @return array containing 2 values: streetName and streetNumber
          */
-        private function separateAddressLine( $addressLine ) {
+        private function wcwp_separateAddressLine($addressLine ) {
             if ( preg_match( '/^([^\d]*[^\d\s]) *(\d.*)$/', $addressLine, $result ) ) {
                 if ( count( $result ) >= 2 ) {
                     $streetName = $result[1];
@@ -270,7 +266,7 @@ private function separateAddressLine( $addressLine ) {
         }
 
 
-        private function get_customer_address_street_and_housenumber( $order_meta, $suffix ) {
+        private function wcwp_get_customer_address_street_and_housenumber($order_meta, $suffix ) {
             if ( isset( $order_meta['_shipping' . $suffix]) && ! empty( $order_meta['_shipping' . $suffix][0] ) ) {
                 return $order_meta['_shipping' . $suffix][0];
             } else if ( isset( $order_meta['_shipping_address_1'] ) && ! empty( $order_meta['_shipping_address_1'] ) ) {
@@ -288,7 +284,7 @@ private function get_customer_address_street_and_housenumber( $order_meta, $suff
          * @param $order_meta , $suffix
          * @return $order_meta
          */
-        private function get_customer_address_part( $order_meta, $suffix ) {
+        private function wcwp_get_customer_address_part($order_meta, $suffix ) {
             if ( isset($order_meta['_shipping' . $suffix] ) && ! empty( $order_meta['_shipping' . $suffix][0] ) ) {
                 return $order_meta['_shipping' . $suffix][0];
             } else if ( isset($order_meta['_billing' . $suffix] ) && ! empty( $order_meta['_billing' . $suffix][0] ) ) {
@@ -304,11 +300,11 @@ private function get_customer_address_part( $order_meta, $suffix ) {
          * @param $order_meta
          * @return array containing 2 values: streetName and streetNumber
          */
-        private function get_customer_address_from_address_line( $order_meta ) {
+        private function wcwp_get_customer_address_from_address_line($order_meta ) {
             if ( isset( $order_meta['_shipping_address_1'] ) && ! empty( $order_meta['_shipping_address_1'] ) ) {
-                return $this->separateAddressLine( $order_meta['_shipping_address_1'][0] );
+                return $this->wcwp_separateAddressLine( $order_meta['_shipping_address_1'][0] );
             } else if ( isset( $order_meta['_billing_address_1'] ) && ! empty( $order_meta['_billing_address_1'] ) ) {
-                return $this->separateAddressLine( $order_meta['_billing_address_1'][0] );
+                return $this->wcwp_separateAddressLine( $order_meta['_billing_address_1'][0] );
             } else {
                 return '';
             }
@@ -320,31 +316,31 @@ private function get_customer_address_from_address_line( $order_meta ) {
          * @param $orderid
          * @return $deliveryAddress
          */
-        public function get_customer_address( $orderid ) {
+        public function wcwp_get_customer_address($orderid ) {
             // Get customer address from order
             $order_meta = get_post_meta( $orderid );
             $deliveryAddress = new \Wuunder\Api\Config\AddressConfig();
-            $street_name = $this->get_customer_address_street_and_housenumber( $order_meta, '_street_name' );
+            $street_name = $this->wcwp_get_customer_address_street_and_housenumber( $order_meta, '_street_name' );
             if ( empty( $street_name ) ) {
-                $street_name = $this->get_customer_address_from_address_line( $order_meta )[0];
+                $street_name = $this->wcwp_get_customer_address_from_address_line( $order_meta )[0];
             }
-            $house_number = $this->get_customer_address_street_and_housenumber( $order_meta, '_house_number' ) . $this->get_customer_address_street_and_housenumber( $order_meta, '_house_number_suffix' );
+            $house_number = $this->wcwp_get_customer_address_street_and_housenumber( $order_meta, '_house_number' ) . $this->wcwp_get_customer_address_street_and_housenumber( $order_meta, '_house_number_suffix' );
             if ( empty( $house_number ) ) {
-                $house_number = $this->get_customer_address_from_address_line( $order_meta )[1];
+                $house_number = $this->wcwp_get_customer_address_from_address_line( $order_meta )[1];
             }
-            $deliveryAddress->setEmailAddress( $this->get_customer_address_part( $order_meta, '_email' ) );
-            $deliveryAddress->setFamilyName( $this->get_customer_address_part( $order_meta, '_last_name' ) );
-            $deliveryAddress->setGivenName( $this->get_customer_address_part( $order_meta, '_first_name' ) );
-            $deliveryAddress->setLocality( $this->get_customer_address_part( $order_meta, '_city' ) );
+            $deliveryAddress->setEmailAddress( $this->wcwp_get_customer_address_part( $order_meta, '_email' ) );
+            $deliveryAddress->setFamilyName( $this->wcwp_get_customer_address_part( $order_meta, '_last_name' ) );
+            $deliveryAddress->setGivenName( $this->wcwp_get_customer_address_part( $order_meta, '_first_name' ) );
+            $deliveryAddress->setLocality( $this->wcwp_get_customer_address_part( $order_meta, '_city' ) );
             $deliveryAddress->setStreetName( $street_name );
             $deliveryAddress->setHouseNumber( $house_number );
-            $deliveryAddress->setZipCode(str_replace( ' ', '', $this->get_customer_address_part( $order_meta, '_postcode' ) ) );
+            $deliveryAddress->setZipCode(str_replace( ' ', '', $this->wcwp_get_customer_address_part( $order_meta, '_postcode' ) ) );
             $deliveryAddress->setPhoneNumber( $order_meta['_billing_phone'][0] );
-            $deliveryAddress->setCountry( $this->get_customer_address_part( $order_meta, '_country' ) );
+            $deliveryAddress->setCountry( $this->wcwp_get_customer_address_part( $order_meta, '_country' ) );
             if ( $deliveryAddress->validate() ) {
                 return $deliveryAddress;
             } else {
-                wuunder_log( 'error', 'Invalid delivery address. There are mistakes or missing fields.' );
+                wcwp_log( 'error', 'Invalid delivery address. There are mistakes or missing fields.' );
                 return $deliveryAddress;
             }
         }
@@ -355,12 +351,12 @@ public function get_customer_address( $orderid ) {
          * @param $imagepath
          * @return $image
          */
-        public function get_base64_image( $imagepath ) {
+        public function wcwp_get_base64_image($imagepath ) {
             try {
-                $fileSize = ( 'http' === substr( $imagepath, 0, 4 ) ) ? $this->remote_filesize( $imagepath ) : filesize( $imagepath );
-                wuunder_log( 'info', 'Handling a image of size: ' . $fileSize );
+                $fileSize = ( 'http' === substr( $imagepath, 0, 4 ) ) ? $this->wcwp_remote_filesize( $imagepath ) : filesize( $imagepath );
+                wcwp_log( 'info', 'Handling a image of size: ' . $fileSize );
                 if ( $fileSize > 0 && $fileSize <= 2097152 ) { //smaller or equal to 2MB
-                    wuunder_log( 'info', 'Base64 encoding image' );
+                    wcwp_log( 'info', 'Base64 encoding image' );
                     $imagedata = file_get_contents( $imagepath );
                     $image = base64_encode( $imagedata );
                 } else {
@@ -368,12 +364,12 @@ public function get_base64_image( $imagepath ) {
                 }
                 return $image;
             } catch ( Exception $e ) {
-                wuunder_log( 'error', $e );
+                wcwp_log( 'error', $e );
                 return '';
             }
         }
 
-        function curl_get_file_size( $url ) {
+        function wcwp_curl_get_file_size($url ) {
             // Assume failure.
             $result = -1;
 
@@ -417,8 +413,8 @@ function curl_get_file_size( $url ) {
          * @param $url
          * @return string
          */
-        private function remote_filesize( $url ) {
-            $remoteFilesize = $this->curl_get_file_size( $url );
+        private function wcwp_remote_filesize($url ) {
+            $remoteFilesize = $this->wcwp_curl_get_file_size( $url );
             return $remoteFilesize;
         }
 
@@ -426,7 +422,7 @@ private function remote_filesize( $url ) {
          *
          * @param $order
          */
-        public function add_listing_actions( $order ) {
+        public function wcwp_add_listing_actions($order ) {
             // do not show buttons for trashed orders
             if ( 'trash' == $order->get_status() ) {
                 return;
@@ -485,7 +481,7 @@ public function add_listing_actions( $order ) {
         /**
          * Add the meta box on the single order page
          */
-        public function add_meta_boxes() {
+        public function wcwp_add_meta_boxes() {
             // create PDF buttons
             add_meta_box(
                 'wpo_wcpdf-box',
@@ -500,17 +496,17 @@ public function add_meta_boxes() {
         /**
          * Create the meta box content on the single order page
          */
-        public function sidebar_box_content( $post ) {
+        public function wcwp_sidebar_box_content($post ) {
             global $post_id;
             $order = new WC_Order( $post_id );
-            $this->add_listing_actions( $order );
+            $this->wcwp_add_listing_actions( $order );
         }
 
         /**
          *
          *
          */
-        public function get_order_items(  $order_id ) {
+        public function wcwp_get_order_items($order_id ) {
 
             global $woocommerce;
             $order = new WC_Order(  $order_id );
diff --git a/includes/wcwuunder-export-html.php b/includes/wcwuunder-export-html.php
index 356c685..cf81249 100644
--- a/includes/wcwuunder-export-html.php
+++ b/includes/wcwuunder-export-html.php
@@ -35,64 +35,63 @@
 <script>
 
     function check_phone() {
-        var phonenumber = jQuery( '#wuunderPhonenumber' ).val();
-        var pattern = new RegExp( /^\+[1-9]{1}[0-9]{10}$/ );
-        if ( pattern.test( phonenumber ) ) {
-            jQuery( '#wuunderPhonenumber' ).parent().removeClass( 'has-error' ).addClass( 'has-success' );
+        var phonenumber = jQuery('#wuunderPhonenumber').val();
+        var pattern = new RegExp(/^\+[1-9]{1}[0-9]{10}$/);
+        if (pattern.test(phonenumber)) {
+            jQuery('#wuunderPhonenumber').parent().removeClass('has-error').addClass('has-success');
         } else {
-            jQuery( '#wuunderPhonenumber' ).parent().removeClass( 'has-success' ).addClass( 'has-error' );
+            jQuery('#wuunderPhonenumber').parent().removeClass('has-success').addClass('has-error');
         }
     }
-    jQuery( '#wuunderPhonenumber' ).keyup( function () {
+
+    jQuery('#wuunderPhonenumber').keyup(function () {
         check_phone();
-    } );
+    });
 
-    jQuery( document ).ready( function () {
-        check_phone( );
+    jQuery(document).ready(function () {
+        check_phone();
 
-        jQuery( '.company-address' ).hide();
-        jQuery( '.company-address.address-0' ).show();
+        jQuery('.company-address').hide();
+        jQuery('.company-address.address-0').show();
 
-        jQuery( '.pickup-address' ).click( function () {
-            jQuery( '.company-address' ).hide();
-            jQuery( '.company-address.address-' + jQuery( this ).val() ).show();
-        } );
+        jQuery('.pickup-address').click(function () {
+            jQuery('.company-address').hide();
+            jQuery('.company-address.address-' + jQuery(this).val()).show();
+        });
 
-        jQuery( '.button-wuunder' ).click( function () {
-            jQuery( ".button-wuunder" ).attr( "disabled", true );
+        jQuery('.button-wuunder').click(function () {
+            jQuery(".button-wuunder").attr("disabled", true);
 //            jQuery( '.page-form' ).submit();
-            jQuery.post( window.location.href, jQuery( '.page-form' ).serialize(), function ( data ) {
-                console.log( JSON.parse( data ) );
-                var postData = JSON.parse( data );
-                if ( postData.errors.length ) {
+            jQuery.post(window.location.href, jQuery('.page-form').serialize(), function (data) {
+                var postData = JSON.parse(data);
+                if (postData.errors.length) {
                     var html = "<ul>";
-                    for ( var error in postData.errors ) {
-                        html += "<li>" + postData.errors[error].field + ": " + postData.errors[error].messages.join( ", " ) + "</li>";
+                    for (var error in postData.errors) {
+                        html += "<li>" + postData.errors[error].field + ": " + postData.errors[error].messages.join(", ") + "</li>";
                     }
-                    jQuery( "#alertBox .alert" ).html( html + "</ul>" );
-                    jQuery( "#alertBox" ).show();
-                    jQuery( ".button-wuunder" ).attr( "disabled", false );
-                } else if ( postData.success ) {
-                    window.location.replace( postData.redirect_url );
+                    jQuery("#alertBox .alert").html(html + "</ul>");
+                    jQuery("#alertBox").show();
+                    jQuery(".button-wuunder").attr("disabled", false);
+                } else if (postData.success) {
+                    window.location.replace(postData.redirect_url);
                 }
-            } );
-        } );
-        TB_HEIGHT = Math.round( jQuery( window ).height() - 20 );
-        jQuery( window ).resize( function () {
-            TB_HEIGHT = Math.round( jQuery( window ).height() - 20 );
-            console.log( jQuery( window ).height() )
-        } );
-    } );
+            });
+        });
+        TB_HEIGHT = Math.round(jQuery(window).height() - 20);
+        jQuery(window).resize(function () {
+            TB_HEIGHT = Math.round(jQuery(window).height() - 20);
+        });
+    });
 </script>
 
 <?php
-if ( empty( $check_company ) ) { ?>
+if (empty($check_company)) { ?>
     <div class="warning">
         <img src="<?php echo Woocommerce_Wuunder::$plugin_url . 'assets/images/wuunder_logo.png' ?>"
              style="padding:20px 30px 20px 20px; width:180px;">
         <h2>Uw instellingen zijn niet volledig ingevuld</h2>
         <p>Controleer de gegevens van uw <b>"Standaard afhaaladres"</b>.</p>
-        <a class="btn btn-primary" href="<?php echo admin_url( 'admin.php?page=wc-settings&tab=wuunder' ); ?>">Controleer
+        <a class="btn btn-primary" href="<?php echo admin_url('admin.php?page=wc-settings&tab=wuunder'); ?>">Controleer
             uw instellingen</a>
     </div>
     <?php
@@ -101,23 +100,24 @@ function check_phone() {
 ?>
 
 <form method="post" class="page-form">
-    <?php if ( 'retour' == $_GET['label'] ) { ?>
+    <?php if ('retour' == $_GET['label']) { ?>
         <h1><img style="width:34px;"
-                 src="<?php echo dirname( plugin_dir_url( __FILE__ ) ) ?>/assets/images/create-icon.png"> Retourlabel
+                 src="<?php echo dirname(plugin_dir_url(__FILE__)) ?>/assets/images/create-icon.png"> Retourlabel
             aanmaken</h1>
     <?php } else { ?>
         <h1><img style="width:34px;"
-                 src="<?php echo dirname( plugin_dir_url( __FILE__ ) ) ?>/assets/images/create-icon.png"> Verzendlabel
+                 src="<?php echo dirname(plugin_dir_url(__FILE__)) ?>/assets/images/create-icon.png"> Verzendlabel
             aanmaken</h1>
     <?php } ?>
     <?php
     $c = true;
-    foreach ( $data as $row ) : 
+    foreach ($data as $row) :
         ?>
         <fieldset>
             <input type="hidden" name="data[customer_reference]" value="<?php echo $row['orderid']; ?>">
-            <input type="hidden" name="data[value]" value="<?php echo ( 0 === $row['waarde'] || empty( $row['waarde'] ) ) ? 25 : $row['waarde']; ?>">
-            <input type="hidden" name="data[picture]" value="<?php echo $row['picture']; 
+            <input type="hidden" name="data[value]"
+                   value="<?php echo (0 === $row['waarde'] || empty($row['waarde'])) ? 25 : $row['waarde']; ?>">
+            <input type="hidden" name="data[picture]" value="<?php echo $row['picture'];
             ?>
             ">
             <div id="alertBox" class="row">
@@ -136,12 +136,12 @@ function check_phone() {
                                     <label style="line-height: 28px; margin-bottom:0;">Ontvanger</label>
                                 </div>
                                 <div class="col-sm-8">
-                                    <?php if ( 'retour' == $_GET['label'] ) { ?>
+                                    <?php if ('retour' == $_GET['label']) { ?>
                                         <select class="pickup-address form-control" id="inputType"
                                                 name="data[pickup_address]">
-                                            <?php foreach ( $available_addresses as $pickup_address => $straat ) { ?>
+                                            <?php foreach ($available_addresses as $pickup_address => $straat) { ?>
                                                 <option
-                                                    value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
+                                                        value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
                                             <?php } ?>
                                         </select>
                                     <?php } ?>
@@ -149,32 +149,32 @@ function check_phone() {
                             </div>
                         </div>
                         <div class="panel-body">
-                            <?php if ( 'retour' == $_GET['label'] ) { ?>
+                            <?php if ('retour' == $_GET['label']) { ?>
                                 <?php
-                                foreach ( $available_addresses as $pickup_address => $straat ) {
+                                foreach ($available_addresses as $pickup_address => $straat) {
                                     echo '<div class="company-address address-' . $pickup_address . '>';
-                                    if ( 0 == $pickup_address ) {
+                                    if (0 == $pickup_address) {
                                         // Get Woocommerce Wuunder Settings
-                                        echo get_option( 'wc_wuunder_company_name' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_firstname' ) . ' ' . get_option( 'wc_wuunder_company_lastname' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_street' ) . ' ' . get_option( 'wc_wuunder_company_housenumber' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_postode' ) . ' ' . get_option( 'wc_wuunder_company_city' ) . ' ' . get_option( 'wc_wuunder_company_country' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_email' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_phone' ) . '<br>';
+                                        echo get_option('wc_wuunder_company_name') . '<br>';
+                                        echo get_option('wc_wuunder_company_firstname') . ' ' . get_option('wc_wuunder_company_lastname') . '<br>';
+                                        echo get_option('wc_wuunder_company_street') . ' ' . get_option('wc_wuunder_company_housenumber') . '<br>';
+                                        echo get_option('wc_wuunder_company_postode') . ' ' . get_option('wc_wuunder_company_city') . ' ' . get_option('wc_wuunder_company_country') . '<br>';
+                                        echo get_option('wc_wuunder_company_email') . '<br>';
+                                        echo get_option('wc_wuunder_company_phone') . '<br>';
 
                                     } else {
-                                        echo get_option( 'wc_wuunder_company_name_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_firstname_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_lastname_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_street_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_housenumber_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_postode_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_city_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_country_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_email_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_phone_' . $pickup_address ) . '<br>';
+                                        echo get_option('wc_wuunder_company_name_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_firstname_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_lastname_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_street_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_housenumber_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_postode_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_city_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_country_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_email_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_phone_' . $pickup_address) . '<br>';
                                     }
                                     echo '</div>';
                                 }
                                 ?>
                             <?php } else { ?>
-                                <?php if ( 'NL' == $row['landcode']  && ( empty( $row['straat'] ) || empty( $row['huisnummer'] ) ) ) { ?>
+                                <?php if ('NL' == $row['landcode'] && (empty($row['straat']) || empty($row['huisnummer']))) { ?>
                                     <span style="color:red">Deze order bevat geen geldige straatnaam- en huisnummergegevens, en kan daarom niet worden ge-exporteerd! Waarschijnlijk is deze order geplaatst voordat de Wuunder plugin werd geactiveerd. De gegevens kunnen wel handmatig worden ingevoerd in het order scherm.</span>
                                 <?php } else { ?>
                                     <?php echo $row['bedrijfsnaam'] ?><br/>
@@ -198,12 +198,12 @@ function check_phone() {
                                     <label style="line-height: 28px; margin-bottom:0;">Verzender</label>
                                 </div>
                                 <div class="col-sm-8">
-                                    <?php if ( empty( $_GET['label'] ) ) { ?>
+                                    <?php if (empty($_GET['label'])) { ?>
                                         <select class="pickup-address form-control" id="inputType"
                                                 name="data[pickup_address]">
-                                            <?php foreach ( $available_addresses as $pickup_address => $straat ) { ?>
+                                            <?php foreach ($available_addresses as $pickup_address => $straat) { ?>
                                                 <option
-                                                    value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
+                                                        value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
                                             <?php } ?>
                                         </select>
                                     <?php } ?>
@@ -212,7 +212,7 @@ function check_phone() {
                         </div>
 
                         <div class="panel-body">
-                            <?php if ( 'retour' ==  $_GET['label'] ) { ?>
+                            <?php if ('retour' == $_GET['label']) { ?>
                                 <?php echo $row['bedrijfsnaam'] ?><br/>
                                 t.n.v. <?php echo $row['firstname'] ?><?php echo $row['lastname'] ?><br/>
                                 <?php echo $row['straat'] ?><?php echo $row['huisnummer'] . $row['huisnummertoevoeging'] ?>
@@ -223,24 +223,24 @@ function check_phone() {
                                 <?php echo $row['telefoon'] ?><br/>
                             <?php } else { ?>
                                 <?php
-                                foreach ( $available_addresses as $pickup_address => $straat ) {
+                                foreach ($available_addresses as $pickup_address => $straat) {
                                     echo '<div class="company-address address-' . $pickup_address . '">';
-                                    if (  0 == $pickup_address ) {
+                                    if (0 == $pickup_address) {
                                         // Get Woocommerce Wuunder Settings
-                                        echo get_option( 'wc_wuunder_company_name' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_firstname' ) . ' ' . get_option( 'wc_wuunder_company_lastname' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_street' ) . ' ' . get_option( 'wc_wuunder_company_housenumber' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_postode' ) . ' ' . get_option( 'wc_wuunder_company_city' ) . ' ' . get_option( 'wc_wuunder_company_country' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_email' ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_phone' ) . '<br>';
+                                        echo get_option('wc_wuunder_company_name') . '<br>';
+                                        echo get_option('wc_wuunder_company_firstname') . ' ' . get_option('wc_wuunder_company_lastname') . '<br>';
+                                        echo get_option('wc_wuunder_company_street') . ' ' . get_option('wc_wuunder_company_housenumber') . '<br>';
+                                        echo get_option('wc_wuunder_company_postode') . ' ' . get_option('wc_wuunder_company_city') . ' ' . get_option('wc_wuunder_company_country') . '<br>';
+                                        echo get_option('wc_wuunder_company_email') . '<br>';
+                                        echo get_option('wc_wuunder_company_phone') . '<br>';
 
                                     } else {
-                                        echo get_option( 'wc_wuunder_company_name_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_firstname_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_lastname_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_street_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_housenumber_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_postode_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_city_' . $pickup_address ) . ' ' . get_option( 'wc_wuunder_company_country_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_email_' . $pickup_address ) . '<br>';
-                                        echo get_option( 'wc_wuunder_company_phone_' . $pickup_address ) . '<br>';
+                                        echo get_option('wc_wuunder_company_name_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_firstname_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_lastname_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_street_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_housenumber_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_postode_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_city_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_country_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_email_' . $pickup_address) . '<br>';
+                                        echo get_option('wc_wuunder_company_phone_' . $pickup_address) . '<br>';
                                     }
                                     echo '</div>';
                                 }
@@ -259,7 +259,7 @@ function check_phone() {
                             ( Gebruik de opmaak: +31612345678 )</label>
                         <input type="text" class="form-control input-sm" name="data[phone_number]"
                                id="wuunderPhonenumber"
-                               value="<?php echo( 0 === ( empty( $row['telefoon'] ) || strcmp( $row['telefoon'], "+31" ) ) ? "" : $row['telefoon'] ); ?>"
+                               value="<?php echo(0 === (empty($row['telefoon']) || strcmp($row['telefoon'], "+31")) ? "" : $row['telefoon']); ?>"
                                required="">
                     </div>
                 </div>
@@ -279,7 +279,7 @@ function check_phone() {
                         <tbody>
                         <?php
                         $total_weight = 0;
-                        foreach ( $row['bestelling'] as $product ) {
+                        foreach ($row['bestelling'] as $product) {
                             $total_weight += $product['total_weight'];
                             ?>
                             <tr>
@@ -289,7 +289,7 @@ function check_phone() {
                             </tr>
                             <?php
                         }
-                        if ( 0 === $total_weight ) {
+                        if (0 === $total_weight) {
                             $total_weight = 5000;
                         }
                         ?>
@@ -311,26 +311,26 @@ function check_phone() {
 
                     <div class="form-group">
                         <label for="inputType" class="control-label">Soort verpakking <span
-                                class="text-primary">*</span></label>
+                                    class="text-primary">*</span></label>
                         <select class="form-control input-sm" id="inputType" name="data[kind]">
                             <option value="package" selected="">Pakket</option>
                             <option value="document">Document</option>
-                            <option value="pallet"<?php if ( $total_weight > 23000 ) {
+                            <option value="pallet"<?php if ($total_weight > 23000) {
                                 echo ' selected';
                             } ?>>Pallet
                             </option>
                         </select>
                     </div>
                     <?php
-                    if ( 0 === strcmp( $product['dimensions'], "Niet beschikbaar" ) || empty( $product['dimensions'] ) ) {
-                        $size = array( 40, 30, 25 );
+                    if (0 === strcmp($product['dimensions'], "Niet beschikbaar") || empty($product['dimensions'])) {
+                        $size = array(40, 30, 25);
                     } else {
-                        $size = explode( ' x ', $product['dimensions'] );
+                        $size = explode(' x ', $product['dimensions']);
                     }
                     ?>
                     <div class="form-group">
                         <label class="control-label" for="wuunderLength">Afmetingen ( l x b x h ) <span
-                                class="text-primary">*</span></label>
+                                    class="text-primary">*</span></label>
                         <div class="row">
                             <div class="col-xs-4">
                                 <div class="input-group">
@@ -349,7 +349,7 @@ class="text-primary">*</span></label>
                             <div class="col-xs-4">
                                 <div class="input-group">
                                     <input class="form-control input-sm" name="data[height]" id="wuunderHeight"
-                                           type="number" min="1" value="<?php echo str_replace( ' cm', '', $size[2] ); ?>"
+                                           type="number" min="1" value="<?php echo str_replace(' cm', '', $size[2]); ?>"
                                            required="">
                                     <div class="input-group-addon input-sm">cm</div>
                                 </div>
@@ -359,7 +359,7 @@ class="text-primary">*</span></label>
 
                     <div class="form-group">
                         <label class="control-label" for="wuunderWeight">Gewicht <span
-                                class="text-primary">*</span></label>
+                                    class="text-primary">*</span></label>
                         <div class="input-group">
                             <input class="form-control input-sm" name="data[weight]" id="wuunderWeight" type="number"
                                    value="<?php echo $total_weight; ?>" required="">
@@ -369,12 +369,12 @@ class="text-primary">*</span></label>
 
                     <div class="form-group">
                         <label class="control-label" for="wuunderReference">Inhoud zending <span
-                                class="text-primary">*</span></label>
+                                    class="text-primary">*</span></label>
                         <input class="form-control input-sm" name="data[description]" id="wuunderReference" type="text"
                                placeholder="Wat is de inhoud van de zending die je gaat versturen?"
-                               value="<?php foreach ( $row['bestelling'] as $product ) {
+                               value="<?php foreach ($row['bestelling'] as $product) {
                                    echo $product['name'] . $product['variation'];
-                                   if ( next( $row['bestelling'] ) ) {
+                                   if (next($row['bestelling'])) {
                                        echo ', ';
                                    }
                                } ?>" required="">
@@ -387,7 +387,7 @@ class="text-primary">*</span></label>
                     </div>
 
                     <div class="form-group">
-                        <?php if ( 'retour' == $_GET['label'] ) { ?>
+                        <?php if ('retour' == $_GET['label']) { ?>
                             <input type="hidden" name="action" value="wcwuunder-retour">
                             <input type="submit" value="Vraag retourlabel aan"
                                    class="button-wuunder btn save_order btn-primary tips">
diff --git a/includes/wcwuunder-settings.php b/includes/wcwuunder-settings.php
index 02f5f1f..e9c24ce 100644
--- a/includes/wcwuunder-settings.php
+++ b/includes/wcwuunder-settings.php
@@ -8,18 +8,18 @@ class WC_Wuunder_Settings {
 
         public function __construct() {
             // Add setting tab "Reatiler" on woocommerce settings page
-            add_filter( 'woocommerce_settings_tabs_array', array( &$this, 'add_settings_tab' ), 50 );
-            add_action( 'woocommerce_settings_tabs_wuunder', array( &$this, 'settings_tab' ) );
-            add_action( 'woocommerce_update_options_wuunder', array(&$this, 'update_settings' ) );
+            add_filter( 'woocommerce_settings_tabs_array', array( &$this, 'wcwp_add_settings_tab' ), 50 );
+            add_action( 'woocommerce_settings_tabs_wuunder', array( &$this, 'wcwp_settings_tab' ) );
+            add_action( 'woocommerce_update_options_wuunder', array(&$this, 'wcwp_update_settings' ) );
 
         }
 
-        public static function add_settings_tab( $settings_tabs ) {
+        public static function wcwp_add_settings_tab($settings_tabs ) {
             $settings_tabs['wuunder'] = __( 'Wuunder', 'woocommerce-wuunder' );
             return $settings_tabs;
         }
 
-        public static function settings_tab() {
+        public static function wcwp_settings_tab() {
             ?>
             <style>
                 .address {
@@ -74,26 +74,26 @@ public static function settings_tab() {
 				<p>Meer weten? Bezoek onze website <a href="http://www.wearewuunder.com/" target="_blank">www.wearewuunder.com</a> of stuur een e-mail naar <a href="mailto:info@WeAreWuunder.com" target="_blank">Info@WeAreWuunder.com</a>.</p>
             </div>';
 
-            woocommerce_admin_fields( self::get_settings() );
+            woocommerce_admin_fields( self::wcwp_get_settings() );
             echo '<h1>Afhaaladressen</h1>';
             echo '<p>Op onderstaande adressen worden je zendingen opgehaald of retouren weer afgeleverd. Gebruik de Bedrijfsnaam, contactpersoon en telefoonnummer waar de chauffeur van de vervoerder terecht kan met vragen. Naar het e-mail adres dat je hier gebruikt sturen we ook de verzendlabels mocht je deze niet willen downloaden via WooCommerce. Gebruik voor retouren de knop in het scherm met de “bestellingen”.</p>';
             echo '<div class="row" style="overflow:hidden;">';
             echo '<div class="address">';
-            woocommerce_admin_fields(self::get_address() );
+            woocommerce_admin_fields(self::wcwp_get_address() );
             echo '</div>';
             echo '<div class="mappings">';
-            woocommerce_admin_fields(self::get_mappings() );
+            woocommerce_admin_fields(self::wcwp_get_mappings() );
             echo '</div>';
             echo '</div>';
         }
 
-        public static function update_settings() {
-            woocommerce_update_options(self::get_settings() );
-            woocommerce_update_options(self::get_mappings() );
-            woocommerce_update_options(self::get_address() );
+        public static function wcwp_update_settings() {
+            woocommerce_update_options(self::wcwp_get_settings() );
+            woocommerce_update_options(self::wcwp_get_mappings() );
+            woocommerce_update_options(self::wcwp_get_address() );
         }
 
-        public static function get_settings() {
+        public static function wcwp_get_settings() {
             $statuses = wc_get_order_statuses();
             $mappedStatuses = array();
             foreach ( $statuses as $key => $value ) {
@@ -152,7 +152,7 @@ public static function get_settings() {
 
 	    }
 
-	    public static function get_mappings() {
+	    public static function wcwp_get_mappings() {
             global $woocommerce;
             $shipping_methods = $woocommerce->shipping->get_shipping_methods();
             $options = array(
@@ -222,7 +222,7 @@ public static function get_mappings() {
             return apply_filters( 'wc_wuunder_settings', $settings );
         }
 
-        public static function get_address() {
+        public static function wcwp_get_address() {
 
             $settings =
                 array(
diff --git a/includes/wcwuunder-shipping-method.php b/includes/wcwuunder-shipping-method.php
index ef692fe..19e2ed2 100644
--- a/includes/wcwuunder-shipping-method.php
+++ b/includes/wcwuunder-shipping-method.php
@@ -51,14 +51,14 @@ public function __construct( $instance_id = 0 ) {
                  */
                 function init() {
                     // Load the settings API
-                    $this->init_form_fields(); // This is part of the settings API. Override the method to add your own settings
+                    $this->wcwp_init_form_fields(); // This is part of the settings API. Override the method to add your own settings
                     $this->init_settings(); // This is part of the settings API. Loads settings you previously init.
                     // Save settings in admin if you have any defined
                     add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
                     update_option( 'default_carrier_list', $this->defaultCarriers );
                 }
 
-                function init_form_fields() {
+                function wcwp_init_form_fields() {
                     $this->form_fields = array(
                         'select_carriers'   => array(
                             'title'             => __('Welke Carriers', 'woocommerce'),
diff --git a/woocommerce-wuunder.php b/woocommerce-wuunder.php
index 53f8a67..6696d47 100644
--- a/woocommerce-wuunder.php
+++ b/woocommerce-wuunder.php
@@ -12,20 +12,20 @@
     exit; // Exit if accessed directly
 }
 
-if ( !defined( 'WW_PLUGIN_DIR' ) ) {
-    define( 'WW_PLUGIN_DIR', dirname( __FILE__ ) );
+if ( !defined( 'WCWP_PLUGIN_DIR' ) ) {
+    define( 'WCWP_PLUGIN_DIR', dirname( __FILE__ ) );
 }
 
-if ( !defined( 'WW_PLUGIN_ROOT_PHP' ) ) {
-    define('WW_PLUGIN_ROOT_PHP', dirname( __FILE__ ) . '/' . basename( __FILE__ ) );
+if ( !defined( 'WCWP_PLUGIN_ROOT_PHP' ) ) {
+    define('WCWP_PLUGIN_ROOT_PHP', dirname( __FILE__ ) . '/' . basename( __FILE__ ) );
 }
 
-if ( !defined( 'WW_PLUGIN_ADMIN_DIR' ) ) {
-    define( 'WW_PLUGIN_ADMIN_DIR', dirname( __FILE__ ) . '/includes' );
+if ( !defined( 'WCWP_PLUGIN_ADMIN_DIR' ) ) {
+    define( 'WCWP_PLUGIN_ADMIN_DIR', dirname( __FILE__ ) . '/includes' );
 }
 
-if ( !defined( 'WW_PLUGIN_TEMPLATE_DIR' ) ) {
-    define( 'WW_PLUGIN_TEMPLATE_DIR', dirname( __FILE__ ) . '/template' );
+if ( !defined( 'WCWP_PLUGIN_TEMPLATE_DIR' ) ) {
+    define( 'WCWP_PLUGIN_TEMPLATE_DIR', dirname( __FILE__ ) . '/template' );
 }
 
 if ( !defined( 'WOOCOMMERCE_VERSION' ) ) {
@@ -47,7 +47,7 @@
 }
 
 require_once 'vendor/autoload.php';
-require_once WW_PLUGIN_ADMIN_DIR . '/logger.php';
+require_once WCWP_PLUGIN_ADMIN_DIR . '/logger.php';
 
 if ( !class_exists( 'Woocommerce_Wuunder' ) ) {
 
@@ -65,34 +65,34 @@ public function __construct() {
             self::$plugin_url = plugin_dir_url( self::$plugin_basename );
             self::$plugin_path = trailingslashit( dirname( __FILE__ ) );
 
-            add_action( 'admin_enqueue_scripts', array( &$this, 'add_admin_styles_scripts' ) );
+            add_action( 'admin_enqueue_scripts', array( &$this, 'wcwp_add_admin_styles_scripts' ) );
 
-            require_once( WW_PLUGIN_ADMIN_DIR . '/wcwuunder-admin.php' );
+            require_once( WCWP_PLUGIN_ADMIN_DIR . '/wcwuunder-admin.php' );
             include_once( 'includes/parcelshop.php' );
             include_once( 'includes/wcwuunder-shipping-method.php' );
             include_once( 'includes/checkout.php' );
             include_once( 'includes/wcwuunder-DPD-standard-shipping.php' );
 
 
-            add_action('wp_ajax_wuunder_parcelshoplocator_get_parcelshop_address', 'getParcelshopAddress');
-            add_action('wp_ajax_nopriv_wuunder_parcelshoplocator_get_parcelshop_address', 'getParcelshopAddress');
-            add_action('wp_ajax_wuunder_parcelshoplocator_get_address', 'getAddress');
-            add_action('wp_ajax_nopriv_wuunder_parcelshoplocator_get_address', 'getAddress');
+            add_action('wp_ajax_wuunder_parcelshoplocator_get_parcelshop_address', 'wcwp_getParcelshopAddress');
+            add_action('wp_ajax_nopriv_wuunder_parcelshoplocator_get_parcelshop_address', 'wcwp_getParcelshopAddress');
+            add_action('wp_ajax_wuunder_parcelshoplocator_get_address', 'wcwp_getAddress');
+            add_action('wp_ajax_nopriv_wuunder_parcelshoplocator_get_address', 'wcwp_getAddress');
 
             add_action( 'wp_loaded', function () {
                 if ( false !== strpos( $_SERVER['REQUEST_URI'], '/wuunder/webhook' ) && 'POST' === $_SERVER['REQUEST_METHOD'] ) {
-                    $this->webhook();
+                    $this->wcwp_webhook();
                     exit;
                 }
             } );
 //            add_action('load-edit.php', array( &$this, 'webhook' ) );
         }
 
-        public function ww_load_textdomain() {
-            load_plugin_textdomain( 'woocommerce-wuunder', false, WW_PLUGIN_DIR . '/lang/' );
+        public function wcwp_load_textdomain() {
+            load_plugin_textdomain( 'woocommerce-wuunder', false, WCWP_PLUGIN_DIR . '/lang/' );
         }
 
-        public function add_admin_styles_scripts() {
+        public function wcwp_add_admin_styles_scripts() {
             global $post_type;
             if ( 'shop_order' == $post_type ) {
 //                wp_enqueue_script( 'thickbox' );
@@ -103,10 +103,10 @@ public function add_admin_styles_scripts() {
             }
         }
 
-        public function webhook() {
-            wuunder_log( 'info', 'Test webhook' );
-            wuunder_log( 'info', $_REQUEST['order'] );
-            wuunder_log( 'info', $_REQUEST['token'] );
+        public function wcwp_webhook() {
+            wcwp_log( 'info', 'Test webhook' );
+            wcwp_log( 'info', $_REQUEST['order'] );
+            wcwp_log( 'info', $_REQUEST['token'] );
 
             if ( !isset($_REQUEST['order'] ) || !isset( $_REQUEST['token'] ) ) {
                 wp_redirect( '', 500 );