From b2ef17f8722f64820ea040f89d0d6162cba2eb71 Mon Sep 17 00:00:00 2001
From: Brandon Hubbard <bkhubbard@gmail.com>
Date: Fri, 16 Nov 2018 14:31:41 -0800
Subject: [PATCH] WP Enforcer & Auto Fixes

Installed WP Enforcer and ran PHP Code Beautifier and Fixer.
---
 .gitignore                                  |   3 +
 composer.lock                               | 153 ++++++
 includes/ReCaptcha/ReCaptcha.php            | 117 ++---
 includes/ReCaptcha/RequestMethod.php        |  18 +-
 includes/ReCaptcha/RequestParameters.php    | 128 ++---
 includes/ReCaptcha/Response.php             | 120 +++--
 includes/class-admin-notice.php             |  36 +-
 includes/class-featured-listings-widget.php | 135 ++---
 includes/class-listing-import.php           | 523 ++++++++++---------
 includes/class-listing-template.php         |  34 +-
 includes/class-listings-search-widget.php   |  67 ++-
 includes/class-listings.php                 | 300 ++++++-----
 includes/class-taxonomies.php               | 546 +++++++++++---------
 includes/functions.php                      | 148 +++---
 includes/helpers.php                        | 120 ++---
 includes/recaptcha.php                      |  63 ++-
 includes/shortcodes.php                     |  84 +--
 includes/views/agentevo-metabox.php         |   2 +-
 includes/views/archive-listing.php          | 115 +++--
 includes/views/create-tax.php               |  24 +-
 includes/views/edit-tax.php                 |   4 +-
 includes/views/idx-metabox.php              |   2 +-
 includes/views/listing-details-metabox.php  | 132 ++---
 includes/views/listing-features-metabox.php |  15 +-
 includes/views/reorder-tax.php              |  47 +-
 includes/views/single-listing.php           | 465 +++++++++--------
 includes/views/wp-listings-settings.php     | 258 ++++-----
 includes/wp-api.php                         | 198 +++----
 phpcs.xml                                   |  24 +
 plugin.php                                  | 143 ++---
 uninstall.php                               |  54 +-
 31 files changed, 2270 insertions(+), 1808 deletions(-)
 create mode 100644 composer.lock
 create mode 100644 phpcs.xml

diff --git a/.gitignore b/.gitignore
index 0b9fec5..0d75da9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -233,3 +233,6 @@ pip-log.txt
 
 #Composer
 composer.json
+
+
+vendor/*
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..14623b4
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,153 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "81ff4fd6aed1d08f491e16f206291a67",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e",
+                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2018-09-23T23:08:17+00:00"
+        },
+        {
+            "name": "stevegrunwell/wp-enforcer",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stevegrunwell/wp-enforcer.git",
+                "reference": "6d583588d06346982b5819066f14675ddc8004d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stevegrunwell/wp-enforcer/zipball/6d583588d06346982b5819066f14675ddc8004d7",
+                "reference": "6d583588d06346982b5819066f14675ddc8004d7",
+                "shasum": ""
+            },
+            "require": {
+                "wp-coding-standards/wpcs": "*"
+            },
+            "bin": [
+                "bin/wp-enforcer"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Steve Grunwell",
+                    "email": "steve@stevegrunwell.com",
+                    "homepage": "https://stevegrunwell.com"
+                }
+            ],
+            "description": "Git hooks to encourage well-written WordPress.",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "coding standards",
+                "git hooks",
+                "wordpress"
+            ],
+            "time": "2017-05-28T18:44:13+00:00"
+        },
+        {
+            "name": "wp-coding-standards/wpcs",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
+                "reference": "7aa217ab38156c5cb4eae0f04ae376027c407a9b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/7aa217ab38156c5cb4eae0f04ae376027c407a9b",
+                "reference": "7aa217ab38156c5cb4eae0f04ae376027c407a9b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
+            },
+            "require-dev": {
+                "phpcompatibility/php-compatibility": "^9.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "wordpress"
+            ],
+            "time": "2018-11-12T10:13:12+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/includes/ReCaptcha/ReCaptcha.php b/includes/ReCaptcha/ReCaptcha.php
index c157dc9..1ca431d 100755
--- a/includes/ReCaptcha/ReCaptcha.php
+++ b/includes/ReCaptcha/ReCaptcha.php
@@ -29,70 +29,71 @@
 /**
  * reCAPTCHA client.
  */
-class ReCaptcha
-{
-    /**
-     * Version of this client library.
-     * @const string
-     */
-    const VERSION = 'php_1.1.2';
+class ReCaptcha {
 
-    /**
-     * Shared secret for the site.
-     * @var string
-     */
-    private $secret;
+	/**
+	 * Version of this client library.
+	 *
+	 * @const string
+	 */
+	const VERSION = 'php_1.1.2';
 
-    /**
-     * Method used to communicate with service. Defaults to POST request.
-     * @var RequestMethod
-     */
-    private $requestMethod;
+	/**
+	 * Shared secret for the site.
+	 *
+	 * @var string
+	 */
+	private $secret;
 
-    /**
-     * Create a configured instance to use the reCAPTCHA service.
-     *
-     * @param string $secret shared secret between site and reCAPTCHA server.
-     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
-     * @throws \RuntimeException if $secret is invalid
-     */
-    public function __construct($secret, RequestMethod $requestMethod = null)
-    {
-        if (empty($secret)) {
-            throw new \RuntimeException('No secret provided');
-        }
+	/**
+	 * Method used to communicate with service. Defaults to POST request.
+	 *
+	 * @var RequestMethod
+	 */
+	private $requestMethod;
 
-        if (!is_string($secret)) {
-            throw new \RuntimeException('The provided secret must be a string');
-        }
+	/**
+	 * Create a configured instance to use the reCAPTCHA service.
+	 *
+	 * @param string        $secret shared secret between site and reCAPTCHA server.
+	 * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
+	 * @throws \RuntimeException if $secret is invalid
+	 */
+	public function __construct( $secret, RequestMethod $requestMethod = null ) {
+		if ( empty( $secret ) ) {
+			throw new \RuntimeException( 'No secret provided' );
+		}
 
-        $this->secret = $secret;
+		if ( ! is_string( $secret ) ) {
+			throw new \RuntimeException( 'The provided secret must be a string' );
+		}
 
-        if (!is_null($requestMethod)) {
-            $this->requestMethod = $requestMethod;
-        } else {
-            $this->requestMethod = new RequestMethod\Post();
-        }
-    }
+		$this->secret = $secret;
 
-    /**
-     * Calls the reCAPTCHA siteverify API to verify whether the user passes
-     * CAPTCHA test.
-     *
-     * @param string $response The value of 'g-recaptcha-response' in the submitted form.
-     * @param string $remoteIp The end user's IP address.
-     * @return Response Response from the service.
-     */
-    public function verify($response, $remoteIp = null)
-    {
-        // Discard empty solution submissions
-        if (empty($response)) {
-            $recaptchaResponse = new Response(false, array('missing-input-response'));
-            return $recaptchaResponse;
-        }
+		if ( ! is_null( $requestMethod ) ) {
+			$this->requestMethod = $requestMethod;
+		} else {
+			$this->requestMethod = new RequestMethod\Post();
+		}
+	}
 
-        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
-        $rawResponse = $this->requestMethod->submit($params);
-        return Response::fromJson($rawResponse);
-    }
+	/**
+	 * Calls the reCAPTCHA siteverify API to verify whether the user passes
+	 * CAPTCHA test.
+	 *
+	 * @param string $response The value of 'g-recaptcha-response' in the submitted form.
+	 * @param string $remoteIp The end user's IP address.
+	 * @return Response Response from the service.
+	 */
+	public function verify( $response, $remoteIp = null ) {
+		// Discard empty solution submissions
+		if ( empty( $response ) ) {
+			$recaptchaResponse = new Response( false, array( 'missing-input-response' ) );
+			return $recaptchaResponse;
+		}
+
+		$params      = new RequestParameters( $this->secret, $response, $remoteIp, self::VERSION );
+		$rawResponse = $this->requestMethod->submit( $params );
+		return Response::fromJson( $rawResponse );
+	}
 }
diff --git a/includes/ReCaptcha/RequestMethod.php b/includes/ReCaptcha/RequestMethod.php
index fc4dde5..78fa249 100755
--- a/includes/ReCaptcha/RequestMethod.php
+++ b/includes/ReCaptcha/RequestMethod.php
@@ -29,14 +29,14 @@
 /**
  * Method used to send the request to the service.
  */
-interface RequestMethod
-{
+interface RequestMethod {
 
-    /**
-     * Submit the request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params);
+
+	/**
+	 * Submit the request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit( RequestParameters $params);
 }
diff --git a/includes/ReCaptcha/RequestParameters.php b/includes/ReCaptcha/RequestParameters.php
index cb66f26..9d47b58 100755
--- a/includes/ReCaptcha/RequestParameters.php
+++ b/includes/ReCaptcha/RequestParameters.php
@@ -29,75 +29,79 @@
 /**
  * Stores and formats the parameters for the request to the reCAPTCHA service.
  */
-class RequestParameters
-{
-    /**
-     * Site secret.
-     * @var string
-     */
-    private $secret;
+class RequestParameters {
 
-    /**
-     * Form response.
-     * @var string
-     */
-    private $response;
+	/**
+	 * Site secret.
+	 *
+	 * @var string
+	 */
+	private $secret;
 
-    /**
-     * Remote user's IP address.
-     * @var string
-     */
-    private $remoteIp;
+	/**
+	 * Form response.
+	 *
+	 * @var string
+	 */
+	private $response;
 
-    /**
-     * Client version.
-     * @var string
-     */
-    private $version;
+	/**
+	 * Remote user's IP address.
+	 *
+	 * @var string
+	 */
+	private $remoteIp;
 
-    /**
-     * Initialise parameters.
-     *
-     * @param string $secret Site secret.
-     * @param string $response Value from g-captcha-response form field.
-     * @param string $remoteIp User's IP address.
-     * @param string $version Version of this client library.
-     */
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
-    {
-        $this->secret = $secret;
-        $this->response = $response;
-        $this->remoteIp = $remoteIp;
-        $this->version = $version;
-    }
+	/**
+	 * Client version.
+	 *
+	 * @var string
+	 */
+	private $version;
 
-    /**
-     * Array representation.
-     *
-     * @return array Array formatted parameters.
-     */
-    public function toArray()
-    {
-        $params = array('secret' => $this->secret, 'response' => $this->response);
+	/**
+	 * Initialise parameters.
+	 *
+	 * @param string $secret Site secret.
+	 * @param string $response Value from g-captcha-response form field.
+	 * @param string $remoteIp User's IP address.
+	 * @param string $version Version of this client library.
+	 */
+	public function __construct( $secret, $response, $remoteIp = null, $version = null ) {
+		$this->secret   = $secret;
+		$this->response = $response;
+		$this->remoteIp = $remoteIp;
+		$this->version  = $version;
+	}
 
-        if (!is_null($this->remoteIp)) {
-            $params['remoteip'] = $this->remoteIp;
-        }
+	/**
+	 * Array representation.
+	 *
+	 * @return array Array formatted parameters.
+	 */
+	public function toArray() {
+		$params = array(
+			'secret'   => $this->secret,
+			'response' => $this->response,
+		);
 
-        if (!is_null($this->version)) {
-            $params['version'] = $this->version;
-        }
+		if ( ! is_null( $this->remoteIp ) ) {
+			$params['remoteip'] = $this->remoteIp;
+		}
 
-        return $params;
-    }
+		if ( ! is_null( $this->version ) ) {
+			$params['version'] = $this->version;
+		}
 
-    /**
-     * Query string representation for HTTP request.
-     *
-     * @return string Query string formatted parameters.
-     */
-    public function toQueryString()
-    {
-        return http_build_query($this->toArray(), '', '&');
-    }
+		return $params;
+	}
+
+	/**
+	 * Query string representation for HTTP request.
+	 *
+	 * @return string Query string formatted parameters.
+	 */
+	public function toQueryString() {
+		return http_build_query( $this->toArray(), '', '&' );
+	}
 }
diff --git a/includes/ReCaptcha/Response.php b/includes/ReCaptcha/Response.php
index 111df97..eb482bf 100755
--- a/includes/ReCaptcha/Response.php
+++ b/includes/ReCaptcha/Response.php
@@ -29,74 +29,72 @@
 /**
  * The response returned from the service.
  */
-class Response
-{
-    /**
-     * Success or failure.
-     * @var boolean
-     */
-    private $success = false;
+class Response {
 
-    /**
-     * Error code strings.
-     * @var array
-     */
-    private $errorCodes = array();
+	/**
+	 * Success or failure.
+	 *
+	 * @var boolean
+	 */
+	private $success = false;
 
-    /**
-     * Build the response from the expected JSON returned by the service.
-     *
-     * @param string $json
-     * @return \ReCaptcha\Response
-     */
-    public static function fromJson($json)
-    {
-        $responseData = json_decode($json, true);
+	/**
+	 * Error code strings.
+	 *
+	 * @var array
+	 */
+	private $errorCodes = array();
 
-        if (!$responseData) {
-            return new Response(false, array('invalid-json'));
-        }
+	/**
+	 * Build the response from the expected JSON returned by the service.
+	 *
+	 * @param string $json
+	 * @return \ReCaptcha\Response
+	 */
+	public static function fromJson( $json ) {
+		$responseData = json_decode( $json, true );
 
-        if (isset($responseData['success']) && $responseData['success'] == true) {
-            return new Response(true);
-        }
+		if ( ! $responseData ) {
+			return new Response( false, array( 'invalid-json' ) );
+		}
 
-        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
-            return new Response(false, $responseData['error-codes']);
-        }
+		if ( isset( $responseData['success'] ) && $responseData['success'] == true ) {
+			return new Response( true );
+		}
 
-        return new Response(false);
-    }
+		if ( isset( $responseData['error-codes'] ) && is_array( $responseData['error-codes'] ) ) {
+			return new Response( false, $responseData['error-codes'] );
+		}
 
-    /**
-     * Constructor.
-     *
-     * @param boolean $success
-     * @param array $errorCodes
-     */
-    public function __construct($success, array $errorCodes = array())
-    {
-        $this->success = $success;
-        $this->errorCodes = $errorCodes;
-    }
+		return new Response( false );
+	}
 
-    /**
-     * Is success?
-     *
-     * @return boolean
-     */
-    public function isSuccess()
-    {
-        return $this->success;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param boolean $success
+	 * @param array   $errorCodes
+	 */
+	public function __construct( $success, array $errorCodes = array() ) {
+		$this->success    = $success;
+		$this->errorCodes = $errorCodes;
+	}
 
-    /**
-     * Get error codes.
-     *
-     * @return array
-     */
-    public function getErrorCodes()
-    {
-        return $this->errorCodes;
-    }
+	/**
+	 * Is success?
+	 *
+	 * @return boolean
+	 */
+	public function isSuccess() {
+		return $this->success;
+	}
+
+	/**
+	 * Get error codes.
+	 *
+	 * @return array
+	 */
+	public function getErrorCodes() {
+		return $this->errorCodes;
+	}
 }
diff --git a/includes/class-admin-notice.php b/includes/class-admin-notice.php
index 0a13d8c..c71c1ac 100755
--- a/includes/class-admin-notice.php
+++ b/includes/class-admin-notice.php
@@ -38,7 +38,7 @@ class WP_Listings_Admin_Notice {
 	 *
 	 * @var string
 	 */
-	protected static $nonce_field  = '';
+	protected static $nonce_field = '';
 
 	/**
 	 * The ignore key
@@ -49,22 +49,22 @@ class WP_Listings_Admin_Notice {
 	 *
 	 * @var string
 	 */
-	protected static $ignore_key   = '';
+	protected static $ignore_key = '';
 
 	/**
 	 * Output the message
 	 *
 	 * @since 1.3
 	 *
-	 * @param string $message The text of the message.
-	 * @param bool $error Optional. Whether to show as error or update. Default is notice.
-	 * @param string $cap_check Optional. Minimum user capability to show notice to. Default is "activate_plugins"
+	 * @param string      $message The text of the message.
+	 * @param bool        $error Optional. Whether to show as error or update. Default is notice.
+	 * @param string      $cap_check Optional. Minimum user capability to show notice to. Default is "activate_plugins"
 	 * @param string|bool $ignore_key Optional. The user meta key to use for storing if this message has been dismissed by current user or not. If false, it will be generated.
 	 *
 	 * @return string|void Admin notice if is_admin() and not dismissed.
 	 */
-	public static function notice( $message,  $error = false, $cap_check = 'activate_plugins', $ignore_key = false ) {
-		if ( is_admin() && ( !defined( 'DOING_AJAX' ) || !DOING_AJAX ) ) {
+	public static function notice( $message, $error = false, $cap_check = 'activate_plugins', $ignore_key = false ) {
+		if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
 			if ( current_user_can( $cap_check ) ) {
 				$user_id = get_current_user_id();
 				if ( ! is_string( $ignore_key ) ) {
@@ -96,9 +96,7 @@ public static function notice( $message,  $error = false, $cap_check = 'activate
 					return implode( '', $out );
 
 				}
-
 			}
-
 		}
 
 	}
@@ -114,11 +112,15 @@ public static function js_css() {
 		global $wp_version;
 		wp_enqueue_style( 'wp-listings-admin-notice', plugin_dir_url( __FILE__ ) . '/includes/css/wp-listings-admin-notice.css' );
 		wp_enqueue_script( 'wp-listings-admin', plugin_dir_url( __FILE__ ) . '/includes/js/admin.js' );
-		wp_localize_script( 'wp-listings-admin', 'wp_listings_adminL10n', array(
-			'nonce'      => wp_create_nonce( self::$nonce_action ),
-			'wp_version' => $wp_version,
-			'dismiss'    => __( 'Dismiss this notice', 'wp-listings' ),
-		) );
+		wp_localize_script(
+			'wp-listings-admin',
+			'wp_listings_adminL10n',
+			array(
+				'nonce'      => wp_create_nonce( self::$nonce_action ),
+				'wp_version' => $wp_version,
+				'dismiss'    => __( 'Dismiss this notice', 'wp-listings' ),
+			)
+		);
 	}
 
 	/**
@@ -131,12 +133,12 @@ public static function js_css() {
 	 * @return bool
 	 */
 	public static function ajax_cb() {
-		if (  ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], self::$nonce_action ) ) {
+		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], self::$nonce_action ) ) {
 			return false;
 		}
 
-		$nag = sanitize_key( $_POST[ 'nag' ] );
-		if ( $nag === $_POST[ 'nag' ] ) {
+		$nag = sanitize_key( $_POST['nag'] );
+		if ( $nag === $_POST['nag'] ) {
 			update_user_meta( get_current_user_id(), $nag, true );
 		}
 
diff --git a/includes/class-featured-listings-widget.php b/includes/class-featured-listings-widget.php
index f111076..c3c696b 100755
--- a/includes/class-featured-listings-widget.php
+++ b/includes/class-featured-listings-widget.php
@@ -8,8 +8,15 @@
 class WP_Listings_Featured_Listings_Widget extends WP_Widget {
 
 	function __construct() {
-		$widget_ops  = array( 'classname' => 'wplistings-featured-listings clearfix', 'description' => __( 'Display grid-style featured listings', 'wp-listings' ), 'customize_selective_refresh' => true );
-		$control_ops = array( 'width' => 300, 'height' => 350 );
+		$widget_ops  = array(
+			'classname'                   => 'wplistings-featured-listings clearfix',
+			'description'                 => __( 'Display grid-style featured listings', 'wp-listings' ),
+			'customize_selective_refresh' => true,
+		);
+		$control_ops = array(
+			'width'  => 300,
+			'height' => 350,
+		);
 		parent::__construct( 'wplistings-featured-listings', __( 'IMPress Listings - Featured Listings', 'wp-listings' ), $widget_ops, $control_ops );
 	}
 
@@ -19,15 +26,15 @@ function __construct() {
 	 * @param int $number_columns
 	 * @param int $number_items
 	 */
-	function get_column_class($number_columns) {
+	function get_column_class( $number_columns ) {
 
 		$column_class = '';
 
 		// Max of six columns
-		$number_columns = ( $number_columns > 6 ) ? 6 : (int)$number_columns;
+		$number_columns = ( $number_columns > 6 ) ? 6 : (int) $number_columns;
 
 		// column class
-		switch ($number_columns) {
+		switch ( $number_columns ) {
 			case 0:
 			case 1:
 				$column_class = '';
@@ -56,29 +63,29 @@ function widget( $args, $instance ) {
 
 		extract( $args );
 
-		$options = get_option('plugin_wp_listings_settings');
+		$options = get_option( 'plugin_wp_listings_settings' );
 
-		$column_class = $instance['use_columns'] ? $this->get_column_class($instance['number_columns']) : '';
+		$column_class = $instance['use_columns'] ? $this->get_column_class( $instance['number_columns'] ) : '';
 
 		echo $before_widget;
 
-			if ( ! empty( $instance['title'] ) ) {
-				echo $before_title . apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base ) . $after_title;
-			}
+		if ( ! empty( $instance['title'] ) ) {
+			echo $before_title . apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base ) . $after_title;
+		}
 
-			if ( !empty( $instance['posts_term'] ) ) {
-	            $posts_term = explode( ',', $instance['posts_term'] );
-        	}
+		if ( ! empty( $instance['posts_term'] ) ) {
+			$posts_term = explode( ',', $instance['posts_term'] );
+		}
 
 			$query_args = array(
-				'post_type'			=> 'listing',
-				'posts_per_page'	=> $instance['posts_per_page'],
-				'paged'				=> get_query_var('paged') ? get_query_var('paged') : 1
+				'post_type'      => 'listing',
+				'posts_per_page' => $instance['posts_per_page'],
+				'paged'          => get_query_var( 'paged' ) ? get_query_var( 'paged' ) : 1,
 			);
 
-			if ( !empty( $instance['posts_term'] ) && count($posts_term) == 2 ) {
-				$query_args[$posts_term['0']] = $posts_term['1'];
-			}
+		if ( ! empty( $instance['posts_term'] ) && count( $posts_term ) == 2 ) {
+			$query_args[ $posts_term['0'] ] = $posts_term['1'];
+		}
 
 			$wp_listings_widget_query = new WP_Query( $query_args );
 
@@ -86,7 +93,9 @@ function widget( $args, $instance ) {
 
 			global $post;
 
-			if ( $wp_listings_widget_query->have_posts() ) : while ( $wp_listings_widget_query->have_posts() ) : $wp_listings_widget_query->the_post();
+		if ( $wp_listings_widget_query->have_posts() ) :
+			while ( $wp_listings_widget_query->have_posts() ) :
+				$wp_listings_widget_query->the_post();
 
 				$count = ( $count == $instance['number_columns'] ) ? 1 : $count + 1;
 
@@ -95,7 +104,7 @@ function widget( $args, $instance ) {
 				$loop = sprintf( '<div class="listing-widget-thumb"><a href="%s" class="listing-image-link">%s</a>', get_permalink(), get_the_post_thumbnail( $post->ID, $instance['image_size'] ) );
 
 				if ( '' != wp_listings_get_status() ) {
-					$loop .= sprintf( '<span class="listing-status %s">%s</span>', strtolower(str_replace(' ', '-', wp_listings_get_status())), wp_listings_get_status() );
+					$loop .= sprintf( '<span class="listing-status %s">%s</span>', strtolower( str_replace( ' ', '-', wp_listings_get_status() ) ), wp_listings_get_status() );
 				}
 
 				$loop .= sprintf( '<div class="listing-thumb-meta">' );
@@ -107,7 +116,7 @@ function widget( $args, $instance ) {
 				}
 
 				if ( '' != get_post_meta( $post->ID, '_listing_price', true ) ) {
-					$loop .= sprintf( '<span class="listing-price"><span class="currency-symbol">%s</span>%s %s</span>', $options['wp_listings_currency_symbol'], get_post_meta( $post->ID, '_listing_price', true ), (isset($options['wp_listings_display_currency_code']) && $options['wp_listings_display_currency_code'] == 1) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>': '' );
+					$loop .= sprintf( '<span class="listing-price"><span class="currency-symbol">%s</span>%s %s</span>', $options['wp_listings_currency_symbol'], get_post_meta( $post->ID, '_listing_price', true ), ( isset( $options['wp_listings_display_currency_code'] ) && $options['wp_listings_display_currency_code'] == 1 ) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>' : '' );
 				}
 
 				$loop .= sprintf( '</div><!-- .listing-thumb-meta --></div><!-- .listing-widget-thumb -->' );
@@ -120,18 +129,19 @@ function widget( $args, $instance ) {
 				$loop .= sprintf( '<p class="listing-address"><span class="listing-address">%s</span><br />', wp_listings_get_address() );
 				$loop .= sprintf( '<span class="listing-city-state-zip">%s, %s %s</span></p>', wp_listings_get_city(), wp_listings_get_state(), get_post_meta( $post->ID, '_listing_zip', true ) );
 
-				if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true )) {
+				if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true ) ) {
 					$loop .= sprintf( '<ul class="listing-beds-baths-sqft"><li class="beds">%s<span>Beds</span></li> <li class="baths">%s<span>Baths</span></li> <li class="sqft">%s<span>Sq ft</span></li></ul>', get_post_meta( $post->ID, '_listing_bedrooms', true ), get_post_meta( $post->ID, '_listing_bathrooms', true ), get_post_meta( $post->ID, '_listing_sqft', true ) );
 				}
 
-				$loop .= sprintf('</div><!-- .listing-widget-details -->');
+				$loop .= sprintf( '</div><!-- .listing-widget-details -->' );
 
 				$loop .= sprintf( '<a href="%s" class="button btn-primary more-link">%s</a>', get_permalink(), __( 'View Listing', 'wp-listings' ) );
 
-				/** wrap in div with possible column class, and output **/
+				/** wrap in div with possible column class, and output */
 				printf( '<div class="listing %s post-%s"><div class="listing-wrap">%s</div></div>', $column_class . $first_class, $post->ID, apply_filters( 'wp_listings_featured_listings_widget_loop', $loop ) );
 
-			endwhile; endif;
+			endwhile;
+endif;
 			wp_reset_postdata();
 
 		echo $after_widget;
@@ -148,10 +158,10 @@ function widget( $args, $instance ) {
 	 * @return array Updated safe values to be saved.
 	 */
 	function update( $new_instance, $old_instance ) {
-		$instance = array();
+		$instance                   = array();
 		$instance['title']          = strip_tags( $new_instance['title'] );
 		$instance['posts_per_page'] = (int) $new_instance['posts_per_page'];
-		$instance['image_size'] 	= strip_tags($new_instance['image_size'] );
+		$instance['image_size']     = strip_tags( $new_instance['image_size'] );
 		$instance['use_columns']    = (int) $new_instance['use_columns'];
 		$instance['number_columns'] = (int) $new_instance['number_columns'];
 		$instance['posts_term']     = strip_tags( $new_instance['posts_term'] );
@@ -161,21 +171,24 @@ function update( $new_instance, $old_instance ) {
 
 	function form( $instance ) {
 
-		$instance = wp_parse_args( $instance, array(
-			'title'				=> '',
-			'posts_per_page'	=> 3,
-			'image_size'		=> 'listings',
-			'use_columns'       => 0,
-			'number_columns'    => 3,
-			'posts_term'        => ''
-		) );
+		$instance = wp_parse_args(
+			$instance,
+			array(
+				'title'          => '',
+				'posts_per_page' => 3,
+				'image_size'     => 'listings',
+				'use_columns'    => 0,
+				'number_columns' => 3,
+				'posts_term'     => '',
+			)
+		);
 
 		printf(
 			'<p><label for="%s">%s</label><input type="text" id="%s" name="%s" value="%s" style="%s" /></p>',
-			$this->get_field_id('title'),
+			$this->get_field_id( 'title' ),
 			__( 'Title:', 'wp-listings' ),
-			$this->get_field_id('title'),
-			$this->get_field_name('title'),
+			$this->get_field_id( 'title' ),
+			$this->get_field_name( 'title' ),
 			esc_attr( $instance['title'] ),
 			'width: 95%;'
 		); ?>
@@ -186,8 +199,9 @@ function form( $instance ) {
 				<option value="thumbnail">thumbnail (<?php echo absint( get_option( 'thumbnail_size_w' ) ); ?>x<?php echo absint( get_option( 'thumbnail_size_h' ) ); ?>)</option>
 				<?php
 				$sizes = wp_listings_get_additional_image_sizes();
-				foreach ( (array) $sizes as $name => $size )
-					echo '<option value="' . esc_attr( $name ) . '" ' . selected( $name, $instance['image_size'], FALSE ) . '>' . esc_html( $name ) . ' (' . absint( $size['width'] ) . 'x' . absint( $size['height'] ) . ')</option>';
+				foreach ( (array) $sizes as $name => $size ) {
+					echo '<option value="' . esc_attr( $name ) . '" ' . selected( $name, $instance['image_size'], false ) . '>' . esc_html( $name ) . ' (' . absint( $size['width'] ) . 'x' . absint( $size['height'] ) . ')</option>';
+				}
 				?>
 			</select>
 		</p>
@@ -196,47 +210,48 @@ function form( $instance ) {
 		printf(
 			'<p>%s <input type="text" name="%s" value="%s" size="3" /></p>',
 			__( 'How many results should be returned?', 'wp-listings' ),
-			$this->get_field_name('posts_per_page'),
+			$this->get_field_name( 'posts_per_page' ),
 			esc_attr( $instance['posts_per_page'] )
 		);
 
-		echo '<p><label for="'. $this->get_field_id( 'posts_term' ) .'">Display by term:</label>
+		echo '<p><label for="' . $this->get_field_id( 'posts_term' ) . '">Display by term:</label>
 
-		<select id="'. $this->get_field_id( 'posts_term' ) .'" name="'. $this->get_field_name( 'posts_term' ) .'">
-			<option style="padding-right:10px;" value="" '. selected( '', $instance['posts_term'], false ) .'>'. __( 'All Taxonomies and Terms', 'wp-listings' ) .'</option>';
+		<select id="' . $this->get_field_id( 'posts_term' ) . '" name="' . $this->get_field_name( 'posts_term' ) . '">
+			<option style="padding-right:10px;" value="" ' . selected( '', $instance['posts_term'], false ) . '>' . __( 'All Taxonomies and Terms', 'wp-listings' ) . '</option>';
 
-			$taxonomies = get_object_taxonomies('listing');
+			$taxonomies = get_object_taxonomies( 'listing' );
 
-			foreach ( $taxonomies as $taxonomy ) {
-				$the_tax_object = get_taxonomy($taxonomy);
+		foreach ( $taxonomies as $taxonomy ) {
+			$the_tax_object = get_taxonomy( $taxonomy );
 
-				echo '<optgroup label="'. esc_attr( $the_tax_object->label ) .'">';
+			echo '<optgroup label="' . esc_attr( $the_tax_object->label ) . '">';
 
-				$terms = get_terms( $taxonomy, 'orderby=name&hide_empty=1' );
+			$terms = get_terms( $taxonomy, 'orderby=name&hide_empty=1' );
 
-				foreach ( $terms as $term )
-					echo '<option style="margin-left: 8px; padding-right:10px;" value="'. esc_attr( $the_tax_object->query_var ) . ',' . $term->slug .'" '. selected( esc_attr( $the_tax_object->query_var ) . ',' . $term->slug, $instance['posts_term'], false ) .'>-' . esc_attr( $term->name ) .'</option>';
+			foreach ( $terms as $term ) {
+				echo '<option style="margin-left: 8px; padding-right:10px;" value="' . esc_attr( $the_tax_object->query_var ) . ',' . $term->slug . '" ' . selected( esc_attr( $the_tax_object->query_var ) . ',' . $term->slug, $instance['posts_term'], false ) . '>-' . esc_attr( $term->name ) . '</option>';
+			}
 
-				echo '</optgroup>';
+			echo '</optgroup>';
 
-			}
+		}
 
 		echo '</select></p>';
 
 		?>
 
 		<p>
-			<input class="checkbox" type="checkbox" <?php checked($instance['use_columns'], 1); ?> id="<?php echo $this->get_field_id( 'use_columns' ); ?>" name="<?php echo $this->get_field_name( 'use_columns' ); ?>" value="1" />
+			<input class="checkbox" type="checkbox" <?php checked( $instance['use_columns'], 1 ); ?> id="<?php echo $this->get_field_id( 'use_columns' ); ?>" name="<?php echo $this->get_field_name( 'use_columns' ); ?>" value="1" />
 			<label for="<?php echo $this->get_field_id( 'use_columns' ); ?>">Split listings into columns?</label>
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id( 'number_columns' ); ?>">Number of columns</label>
 			<select class="widefat" id="<?php echo $this->get_field_id( 'number_columns' ); ?>" name="<?php echo $this->get_field_name( 'number_columns' ); ?>">
-				<option <?php selected($instance['number_columns'], 2); ?> value="2">2</option>
-				<option <?php selected($instance['number_columns'], 3); ?> value="3">3</option>
-				<option <?php selected($instance['number_columns'], 4); ?> value="4">4</option>
-				<option <?php selected($instance['number_columns'], 5); ?> value="5">5</option>
-				<option <?php selected($instance['number_columns'], 6); ?> value="6">6</option>
+				<option <?php selected( $instance['number_columns'], 2 ); ?> value="2">2</option>
+				<option <?php selected( $instance['number_columns'], 3 ); ?> value="3">3</option>
+				<option <?php selected( $instance['number_columns'], 4 ); ?> value="4">4</option>
+				<option <?php selected( $instance['number_columns'], 5 ); ?> value="5">5</option>
+				<option <?php selected( $instance['number_columns'], 6 ); ?> value="6">6</option>
 			</select>
 		</p>
 
diff --git a/includes/class-listing-import.php b/includes/class-listing-import.php
index c962a5c..fa4dadb 100755
--- a/includes/class-listing-import.php
+++ b/includes/class-listing-import.php
@@ -4,7 +4,9 @@
  * to import listing data
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 class WPL_Idx_Listing {
 
 	public $_idx;
@@ -13,31 +15,39 @@ public function __construct() {
 	}
 
 	/**
-	 * Function to get the array key (listingID+mlsID) 
+	 * Function to get the array key (listingID+mlsID)
+	 *
 	 * @param  [type] $array  [description]
 	 * @param  [type] $key    [description]
 	 * @param  [type] $needle [description]
 	 * @return [type]         [description]
 	 */
-	public static function get_key($array, $key, $needle) {
-		if(!$array) return false;
-		foreach($array as $index => $value) {
-			if($value[$key] == $needle) return $index;
+	public static function get_key( $array, $key, $needle ) {
+		if ( ! $array ) {
+			return false;
+		}
+		foreach ( $array as $index => $value ) {
+			if ( $value[ $key ] == $needle ) {
+				return $index;
+			}
 		}
 		return false;
 	}
 
 	/**
 	 * Function to find the key in the array
+	 *
 	 * @param  [type]  $needle   [description]
 	 * @param  [type]  $haystack [description]
 	 * @param  boolean $strict   [description]
 	 * @return [type]            [description]
 	 */
-	public static function in_array($needle, $haystack, $strict = false) {
-		if(!$haystack) return false;
-		foreach ($haystack as $item) {
-			if (($strict ? $item === $needle : $item == $needle) || (is_array($item) && self::in_array($needle, $item, $strict))) {
+	public static function in_array( $needle, $haystack, $strict = false ) {
+		if ( ! $haystack ) {
+			return false;
+		}
+		foreach ( $haystack as $item ) {
+			if ( ( $strict ? $item === $needle : $item == $needle ) || ( is_array( $item ) && self::in_array( $needle, $item, $strict ) ) ) {
 				return true;
 			}
 		}
@@ -46,300 +56,306 @@ public static function in_array($needle, $haystack, $strict = false) {
 
 	/**
 	 * Creates a post of listing type using post data from options page
+	 *
 	 * @param  array $listings listingID of the property
 	 * @return [type] $featured [description]
 	 */
-	public static function wp_listings_idx_create_post($listings) {
-		if(class_exists( 'IDX_Broker_Plugin')) {
-			require_once(ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php');
+	public static function wp_listings_idx_create_post( $listings ) {
+		if ( class_exists( 'IDX_Broker_Plugin' ) ) {
+			require_once ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php';
 
 			// Load Equity API if it exists
-			if(class_exists( 'Equity_Idx_Api' )) {
-				require_once(ABSPATH . 'wp-content/themes/equity/lib/idx/class.Equity_Idx_Api.inc.php');
-				$_equity_idx = new Equity_Idx_Api;
+			if ( class_exists( 'Equity_Idx_Api' ) ) {
+				require_once ABSPATH . 'wp-content/themes/equity/lib/idx/class.Equity_Idx_Api.inc.php';
+				$_equity_idx = new Equity_Idx_Api();
 			}
 
 			// Load IDX Broker API Class and retrieve featured properties
-			$_idx_api = new \IDX\Idx_Api();
-			$properties = $_idx_api->client_properties('featured?disclaimers=true');
+			$_idx_api   = new \IDX\Idx_Api();
+			$properties = $_idx_api->client_properties( 'featured?disclaimers=true' );
 
 			// Load WP options
-			$idx_featured_listing_wp_options = get_option('wp_listings_idx_featured_listing_wp_options');
-			$wpl_options = get_option('plugin_wp_listings_settings');
-			update_option('wp_listings_import_progress', true);
+			$idx_featured_listing_wp_options = get_option( 'wp_listings_idx_featured_listing_wp_options' );
+			$wpl_options                     = get_option( 'plugin_wp_listings_settings' );
+			update_option( 'wp_listings_import_progress', true );
 
-			if( is_array($listings) && is_array($properties) ) {
+			if ( is_array( $listings ) && is_array( $properties ) ) {
 				// Loop through featured properties
-				foreach($properties as $prop) {
+				foreach ( $properties as $prop ) {
 
 					// Get the listing ID
-					$key = self::get_key($properties, 'listingID', $prop['listingID']);
+					$key = self::get_key( $properties, 'listingID', $prop['listingID'] );
 
 					// Add options
-					if(!in_array($prop['listingID'], $listings)) {
-						$idx_featured_listing_wp_options[$prop['listingID']]['listingID'] = $prop['listingID'];
-						$idx_featured_listing_wp_options[$prop['listingID']]['status'] = '';
+					if ( ! in_array( $prop['listingID'], $listings ) ) {
+						$idx_featured_listing_wp_options[ $prop['listingID'] ]['listingID'] = $prop['listingID'];
+						$idx_featured_listing_wp_options[ $prop['listingID'] ]['status']    = '';
 					}
 
 					// Unset options if they don't exist
-					if(isset($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) && !get_post($idx_featured_listing_wp_options[$prop['listingID']]['post_id'])) {
-						unset($idx_featured_listing_wp_options[$prop['listingID']]['post_id']);
-						unset($idx_featured_listing_wp_options[$prop['listingID']]['status']);
-				 	}
+					if ( isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) && ! get_post( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) ) {
+						unset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] );
+						unset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] );
+					}
 
-				 	// Add post and update post meta
-					if(in_array($prop['listingID'], $listings) && !isset($idx_featured_listing_wp_options[$prop['listingID']]['post_id'])) {
+					// Add post and update post meta
+					if ( in_array( $prop['listingID'], $listings ) && ! isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) ) {
 
 						// Get Equity listing API data if available
-						if(class_exists( 'Equity_Idx_Api' )) {
-							$equity_properties = $_equity_idx->equity_listing_ID($prop['idxID'], $prop['listingID']);
+						if ( class_exists( 'Equity_Idx_Api' ) ) {
+							$equity_properties = $_equity_idx->equity_listing_ID( $prop['idxID'], $prop['listingID'] );
 
-							if($equity_properties == false) {
-								add_settings_error('wp_listings_idx_listing_settings_group', 'idx_listing_empty', 'The Equity API returned no data for property ' . $prop['listingID'] . '. This is usually caused by your WordPress domain not matching the approved domain in your IDX account. Only some data has been imported.', 'error');
-								$equity_properties = $properties[$key];
-								delete_transient('equity_listing_' . $prop['listingID']);
+							if ( $equity_properties == false ) {
+								add_settings_error( 'wp_listings_idx_listing_settings_group', 'idx_listing_empty', 'The Equity API returned no data for property ' . $prop['listingID'] . '. This is usually caused by your WordPress domain not matching the approved domain in your IDX account. Only some data has been imported.', 'error' );
+								$equity_properties = $properties[ $key ];
+								delete_transient( 'equity_listing_' . $prop['listingID'] );
 							}
 						}
 
-						if ($properties[$key]['address'] == '' || $properties[$key]['address'] == null) {
-							$properties[$key]['address'] = 'Address unlisted';
+						if ( $properties[ $key ]['address'] == '' || $properties[ $key ]['address'] == null ) {
+							$properties[ $key ]['address'] = 'Address unlisted';
 						}
-						if ($properties[$key]['remarksConcat'] == '' || $properties[$key]['remarksConcat'] == null) {
-							$properties[$key]['remarksConcat'] = $properties[$key]['listingID'];
+						if ( $properties[ $key ]['remarksConcat'] == '' || $properties[ $key ]['remarksConcat'] == null ) {
+							$properties[ $key ]['remarksConcat'] = $properties[ $key ]['listingID'];
 						}
 
-						if(empty($wpl_options['wp_listings_import_title'])) {
-							$title_format = $properties[$key]['address'];
+						if ( empty( $wpl_options['wp_listings_import_title'] ) ) {
+							$title_format = $properties[ $key ]['address'];
 						} else {
 							$title_format = $wpl_options['wp_listings_import_title'];
-							$title_format = str_replace('{{address}}', $properties[$key]['address'], $title_format);
-							$title_format = str_replace('{{city}}', $properties[$key]['cityName'], $title_format);
-							$title_format = str_replace('{{state}}', $properties[$key]['state'], $title_format);
-							$title_format = str_replace('{{zipcode}}', $properties[$key]['zipcode'], $title_format);
-							$title_format = str_replace('{{listingid}}', $properties[$key]['listingID'], $title_format);
+							$title_format = str_replace( '{{address}}', $properties[ $key ]['address'], $title_format );
+							$title_format = str_replace( '{{city}}', $properties[ $key ]['cityName'], $title_format );
+							$title_format = str_replace( '{{state}}', $properties[ $key ]['state'], $title_format );
+							$title_format = str_replace( '{{zipcode}}', $properties[ $key ]['zipcode'], $title_format );
+							$title_format = str_replace( '{{listingid}}', $properties[ $key ]['listingID'], $title_format );
 						}
 
 						// Post creation options
 						$opts = array(
-							'post_content' => $properties[$key]['remarksConcat'],
-							'post_title' => $title_format,
-							'post_status' => 'publish',
-							'post_type' => 'listing',
-							'post_author' => (isset($wpl_options['import_author'])) ? $wpl_options['import_author'] : 1
+							'post_content' => $properties[ $key ]['remarksConcat'],
+							'post_title'   => $title_format,
+							'post_status'  => 'publish',
+							'post_type'    => 'listing',
+							'post_author'  => ( isset( $wpl_options['import_author'] ) ) ? $wpl_options['import_author'] : 1,
 						);
 
 						// Add the post
-						$add_post = wp_insert_post($opts, true);
+						$add_post = wp_insert_post( $opts, true );
 
 						// Show error if wp_insert_post fails
 						// add post meta and update options if success
-						if (is_wp_error($add_post)) {
+						if ( is_wp_error( $add_post ) ) {
 							$error_string = $add_post->get_error_message();
-							add_settings_error('wp_listings_idx_listing_settings_group', 'insert_post_failed', 'WordPress failed to insert the post. Error ' . $error_string, 'error');
-						} elseif($add_post) {
-							$idx_featured_listing_wp_options[$prop['listingID']]['post_id'] = $add_post;
-							$idx_featured_listing_wp_options[$prop['listingID']]['status'] = 'publish';
-							update_post_meta($add_post, '_listing_details_url', $properties[$key]['fullDetailsURL']);
+							add_settings_error( 'wp_listings_idx_listing_settings_group', 'insert_post_failed', 'WordPress failed to insert the post. Error ' . $error_string, 'error' );
+						} elseif ( $add_post ) {
+							$idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] = $add_post;
+							$idx_featured_listing_wp_options[ $prop['listingID'] ]['status']  = 'publish';
+							update_post_meta( $add_post, '_listing_details_url', $properties[ $key ]['fullDetailsURL'] );
 							// Use custom default template if set
-							if(isset($wpl_options['wp_listings_default_template']) && $wpl_options['wp_listings_default_template'] != '') {
-								update_post_meta($add_post, '_wp_post_template', $wpl_options['wp_listings_default_template']);
+							if ( isset( $wpl_options['wp_listings_default_template'] ) && $wpl_options['wp_listings_default_template'] != '' ) {
+								update_post_meta( $add_post, '_wp_post_template', $wpl_options['wp_listings_default_template'] );
 							}
-							if(class_exists( 'Equity_Idx_Api' )) {
-								self::wp_listings_idx_insert_post_meta($add_post, $equity_properties);
+							if ( class_exists( 'Equity_Idx_Api' ) ) {
+								self::wp_listings_idx_insert_post_meta( $add_post, $equity_properties );
 							} else {
-								self::wp_listings_idx_insert_post_meta($add_post, $properties[$key]);
+								self::wp_listings_idx_insert_post_meta( $add_post, $properties[ $key ] );
 							}
 						}
 					}
 					// Change status to publish if it's not already
-					elseif( in_array($prop['listingID'], $listings) && $idx_featured_listing_wp_options[$prop['listingID']]['status'] != 'publish' ) {
-						self::wp_listings_idx_change_post_status($idx_featured_listing_wp_options[$prop['listingID']]['post_id'], 'publish');
-						$idx_featured_listing_wp_options[$prop['listingID']]['status'] = 'publish';
+					elseif ( in_array( $prop['listingID'], $listings ) && $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] != 'publish' ) {
+						self::wp_listings_idx_change_post_status( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'], 'publish' );
+						$idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] = 'publish';
 					}
 					// Change post status or delete post based on options
-					elseif( !in_array($prop['listingID'], $listings) && isset($idx_featured_listing_wp_options[$prop['listingID']]['status']) && $idx_featured_listing_wp_options[$prop['listingID']]['status'] == 'publish' ) {
+					elseif ( ! in_array( $prop['listingID'], $listings ) && isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] ) && $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] == 'publish' ) {
 
 						// Change to draft or delete listing if the post exists but is not in the listing array based on settings
-						if(isset($wpl_options['wp_listings_idx_sold']) && $wpl_options['wp_listings_idx_sold'] == 'sold-draft') {
+						if ( isset( $wpl_options['wp_listings_idx_sold'] ) && $wpl_options['wp_listings_idx_sold'] == 'sold-draft' ) {
 
 							// Change to draft
-							self::wp_listings_idx_change_post_status($idx_featured_listing_wp_options[$prop['listingID']]['post_id'], 'draft');
-							$idx_featured_listing_wp_options[$prop['listingID']]['status'] = 'draft';
-						} elseif(isset($wpl_options['wp_listings_idx_sold']) && $wpl_options['wp_listings_idx_sold'] == 'sold-delete') {
+							self::wp_listings_idx_change_post_status( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'], 'draft' );
+							$idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] = 'draft';
+						} elseif ( isset( $wpl_options['wp_listings_idx_sold'] ) && $wpl_options['wp_listings_idx_sold'] == 'sold-delete' ) {
 
-							$idx_featured_listing_wp_options[$prop['listingID']]['status'] = 'deleted';
+							$idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] = 'deleted';
 
 							// Delete featured image
-							$post_featured_image_id = get_post_thumbnail_id( $idx_featured_listing_wp_options[$prop['listingID']]['post_id'] );
+							$post_featured_image_id = get_post_thumbnail_id( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] );
 							wp_delete_attachment( $post_featured_image_id );
 
-							//Delete post
-							wp_delete_post( $idx_featured_listing_wp_options[$prop['listingID']]['post_id'] );
+							// Delete post
+							wp_delete_post( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] );
 						}
 					}
 				}
 			}
 
 			// Lastly update our options
-			update_option('wp_listings_idx_featured_listing_wp_options', $idx_featured_listing_wp_options);
-			delete_option('wp_listings_import_progress');
+			update_option( 'wp_listings_idx_featured_listing_wp_options', $idx_featured_listing_wp_options );
+			delete_option( 'wp_listings_import_progress' );
 			return $idx_featured_listing_wp_options;
 		}
 	}
 
 	/**
 	 * Update existing post
+	 *
 	 * @return true if success
 	 */
 	public static function wp_listings_update_post() {
 
-		require_once(ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php');
+		require_once ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php';
 
 		// Load IDX Broker API Class and retrieve featured properties
-		$_idx_api = new \IDX\Idx_Api();
-		$properties = $_idx_api->client_properties('featured?disclaimers=true');
+		$_idx_api   = new \IDX\Idx_Api();
+		$properties = $_idx_api->client_properties( 'featured?disclaimers=true' );
 
 		// Load WP options
-		$idx_featured_listing_wp_options = get_option('wp_listings_idx_featured_listing_wp_options');
-		$wpl_options = get_option('plugin_wp_listings_settings');
+		$idx_featured_listing_wp_options = get_option( 'wp_listings_idx_featured_listing_wp_options' );
+		$wpl_options                     = get_option( 'plugin_wp_listings_settings' );
 
 		foreach ( $properties as $prop ) {
 
-			$key = self::get_key($properties, 'listingID', $prop['listingID']);
+			$key = self::get_key( $properties, 'listingID', $prop['listingID'] );
 
-			if( isset($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) ) {
+			if ( isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) ) {
 				// Update property data
-				if(class_exists( 'Equity_Idx_Api' )) {
-					require_once(ABSPATH . 'wp-content/themes/equity/lib/idx/class.Equity_Idx_Api.inc.php');
-					$_equity_idx = new Equity_Idx_Api;
-					$equity_properties = $_equity_idx->equity_listing_ID($prop['idxID'], $prop['listingID']);
-					if($equity_properties == false) {
-						$equity_properties = $properties[$key];
-						delete_transient('equity_listing_' . $prop['listingID']);
+				if ( class_exists( 'Equity_Idx_Api' ) ) {
+					require_once ABSPATH . 'wp-content/themes/equity/lib/idx/class.Equity_Idx_Api.inc.php';
+					$_equity_idx       = new Equity_Idx_Api();
+					$equity_properties = $_equity_idx->equity_listing_ID( $prop['idxID'], $prop['listingID'] );
+					if ( $equity_properties == false ) {
+						$equity_properties = $properties[ $key ];
+						delete_transient( 'equity_listing_' . $prop['listingID'] );
+					}
+					if ( ! isset( $wpl_options['wp_listings_idx_update'] ) || isset( $wpl_options['wp_listings_idx_update'] ) && $wpl_options['wp_listings_idx_update'] != 'update-none' ) {
+						self::wp_listings_idx_insert_post_meta( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'], $equity_properties, true, ( $wpl_options['wp_listings_idx_update'] == 'update-noimage' ) ? false : true, false );
 					}
-					if(!isset($wpl_options['wp_listings_idx_update']) || isset($wpl_options['wp_listings_idx_update']) && $wpl_options['wp_listings_idx_update'] != 'update-none')
-						self::wp_listings_idx_insert_post_meta($idx_featured_listing_wp_options[$prop['listingID']]['post_id'], $equity_properties, true, ($wpl_options['wp_listings_idx_update'] == 'update-noimage') ? false : true, false );
-					$idx_featured_listing_wp_options[$prop['listingID']]['updated'] = date("m/d/Y h:i:sa");
+					$idx_featured_listing_wp_options[ $prop['listingID'] ]['updated'] = date( 'm/d/Y h:i:sa' );
 				} else {
-					if(!isset($wpl_options['wp_listings_idx_update']) || isset($wpl_options['wp_listings_idx_update']) && $wpl_options['wp_listings_idx_update'] != 'update-none')
-						self::wp_listings_idx_insert_post_meta($idx_featured_listing_wp_options[$prop['listingID']]['post_id'], $properties[$key], true, ($wpl_options['wp_listings_idx_update'] == 'update-noimage') ? false : true, false );
-					$idx_featured_listing_wp_options[$prop['listingID']]['updated'] = date("m/d/Y h:i:sa");
+					if ( ! isset( $wpl_options['wp_listings_idx_update'] ) || isset( $wpl_options['wp_listings_idx_update'] ) && $wpl_options['wp_listings_idx_update'] != 'update-none' ) {
+						self::wp_listings_idx_insert_post_meta( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'], $properties[ $key ], true, ( $wpl_options['wp_listings_idx_update'] == 'update-noimage' ) ? false : true, false );
+					}
+					$idx_featured_listing_wp_options[ $prop['listingID'] ]['updated'] = date( 'm/d/Y h:i:sa' );
 				}
 			}
-
 		}
 
 		// Load and loop through Sold properties
-		$sold_properties = $_idx_api->client_properties('soldpending');
+		$sold_properties = $_idx_api->client_properties( 'soldpending' );
 		foreach ( $sold_properties as $sold_prop ) {
 
-			$key = self::get_key($sold_properties, 'listingID', $sold_prop['listingID']);
+			$key = self::get_key( $sold_properties, 'listingID', $sold_prop['listingID'] );
 
-			if( isset($idx_featured_listing_wp_options[$sold_prop['listingID']]['post_id']) ) {
+			if ( isset( $idx_featured_listing_wp_options[ $sold_prop['listingID'] ]['post_id'] ) ) {
 
 				// Update property data
-				self::wp_listings_idx_insert_post_meta($idx_featured_listing_wp_options[$sold_prop['listingID']]['post_id'], $sold_properties[$key], true, ($wpl_options['wp_listings_idx_update'] == 'update-noimage') ? false : true, true );
+				self::wp_listings_idx_insert_post_meta( $idx_featured_listing_wp_options[ $sold_prop['listingID'] ]['post_id'], $sold_properties[ $key ], true, ( $wpl_options['wp_listings_idx_update'] == 'update-noimage' ) ? false : true, true );
 
-				if(isset($wpl_options['wp_listings_idx_sold']) && $wpl_options['wp_listings_idx_sold'] == 'sold-draft') {
+				if ( isset( $wpl_options['wp_listings_idx_sold'] ) && $wpl_options['wp_listings_idx_sold'] == 'sold-draft' ) {
 
 					// Change to draft
-					self::wp_listings_idx_change_post_status($idx_featured_listing_wp_options[$sold_prop['listingID']]['post_id'], 'draft');
-				} elseif(isset($wpl_options['wp_listings_idx_sold']) && $wpl_options['wp_listings_idx_sold'] == 'sold-delete') {
+					self::wp_listings_idx_change_post_status( $idx_featured_listing_wp_options[ $sold_prop['listingID'] ]['post_id'], 'draft' );
+				} elseif ( isset( $wpl_options['wp_listings_idx_sold'] ) && $wpl_options['wp_listings_idx_sold'] == 'sold-delete' ) {
 
 					// Delete featured image
-					$post_featured_image_id = get_post_thumbnail_id( $idx_featured_listing_wp_options[$sold_prop['listingID']]['post_id'] );
+					$post_featured_image_id = get_post_thumbnail_id( $idx_featured_listing_wp_options[ $sold_prop['listingID'] ]['post_id'] );
 					wp_delete_attachment( $post_featured_image_id );
 
-					//Delete post
-					wp_delete_post( $idx_featured_listing_wp_options[$sold_prop['listingID']]['post_id'] );
+					// Delete post
+					wp_delete_post( $idx_featured_listing_wp_options[ $sold_prop['listingID'] ]['post_id'] );
 				}
 			}
-
 		}
 
-		update_option('wp_listings_idx_featured_listing_wp_options', $idx_featured_listing_wp_options);
+		update_option( 'wp_listings_idx_featured_listing_wp_options', $idx_featured_listing_wp_options );
 
 	}
 
 	/**
 	 * Change post status
+	 *
 	 * @param  [type] $post_id [description]
 	 * @param  [type] $status  [description]
 	 * @return [type]          [description]
 	 */
-	public static function wp_listings_idx_change_post_status($post_id, $status){
-	    $current_post = get_post( $post_id, 'ARRAY_A' );
-	    $current_post['post_status'] = $status;
-	    wp_update_post($current_post);
+	public static function wp_listings_idx_change_post_status( $post_id, $status ) {
+		$current_post                = get_post( $post_id, 'ARRAY_A' );
+		$current_post['post_status'] = $status;
+		wp_update_post( $current_post );
 	}
 
 	/**
 	 * Inserts post meta based on property data
 	 * API fields are mapped to post meta fields
 	 * prefixed with _listing_ and lowercased
+	 *
 	 * @param  [type] $id  [description]
 	 * @param  [type] $key [description]
 	 * @return [type]      [description]
 	 */
-	public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listing_data, $update = false, $update_image = true, $sold = false) {
+	public static function wp_listings_idx_insert_post_meta( $id, $idx_featured_listing_data, $update = false, $update_image = true, $sold = false ) {
 
-		if ($update == false || $update_image == true) {
-			$imgs = '';
+		if ( $update == false || $update_image == true ) {
+			$imgs           = '';
 			$featured_image = $idx_featured_listing_data['image']['0']['url'];
 
-			foreach ($idx_featured_listing_data['image'] as $image_data => $img) {
-				if($image_data == "totalCount") continue;
-				$img_markup = sprintf('<img src="%s" alt="%s" />', $img['url'], $idx_featured_listing_data['address']);
-				$imgs .= apply_filters( 'wp_listings_imported_image_markup', $img_markup, $img, $idx_featured_listing_data );
+			foreach ( $idx_featured_listing_data['image'] as $image_data => $img ) {
+				if ( $image_data == 'totalCount' ) {
+					continue;
+				}
+				$img_markup = sprintf( '<img src="%s" alt="%s" />', $img['url'], $idx_featured_listing_data['address'] );
+				$imgs      .= apply_filters( 'wp_listings_imported_image_markup', $img_markup, $img, $idx_featured_listing_data );
 			}
-			update_post_meta($id, '_listing_gallery', apply_filters('wp_listings_imported_gallery', $imgs));
+			update_post_meta( $id, '_listing_gallery', apply_filters( 'wp_listings_imported_gallery', $imgs ) );
 		}
 
 		if ( $idx_featured_listing_data['propStatus'] == 'A' ) {
 			$propstatus = 'Active';
-		} elseif( $idx_featured_listing_data['propStatus'] == 'S' ) {
+		} elseif ( $idx_featured_listing_data['propStatus'] == 'S' ) {
 			$propstatus = 'Sold';
 		} else {
 			$propstatus = ucfirst( $idx_featured_listing_data['propStatus'] );
 		}
 
 		// Add or reset taxonomies for property-types, locations, and status
-		wp_set_object_terms($id, $idx_featured_listing_data['idxPropType'], 'property-types', true);
-		wp_set_object_terms($id, $idx_featured_listing_data['cityName'], 'locations', true);
-		wp_set_object_terms($id, $propstatus, 'status', false);
+		wp_set_object_terms( $id, $idx_featured_listing_data['idxPropType'], 'property-types', true );
+		wp_set_object_terms( $id, $idx_featured_listing_data['cityName'], 'locations', true );
+		wp_set_object_terms( $id, $propstatus, 'status', false );
 
 		// Add post meta for existing WPL fields
-		update_post_meta($id, '_listing_lot_sqft', isset($idx_featured_listing_data['lotSqFt']) ? $idx_featured_listing_data['lotSqFt'] : $idx_featured_listing_data['acres'].' acres');
-		update_post_meta($id, '_listing_acres', $idx_featured_listing_data['acres']);
-		update_post_meta($id, '_listing_price', $idx_featured_listing_data['listingPrice']);
-		update_post_meta($id, '_listing_address', $idx_featured_listing_data['address']);
-		update_post_meta($id, '_listing_city', $idx_featured_listing_data['cityName']);
-		update_post_meta($id, '_listing_county', $idx_featured_listing_data['countyName']);
-		update_post_meta($id, '_listing_state', $idx_featured_listing_data['state']);
-		update_post_meta($id, '_listing_zip', $idx_featured_listing_data['zipcode']);
-		update_post_meta($id, '_listing_mls', $idx_featured_listing_data['listingID']);
-		update_post_meta($id, '_listing_sqft', $idx_featured_listing_data['sqFt']);
-		update_post_meta($id, '_listing_year_built', (isset($idx_featured_listing_data['yearBuilt'])) ? $idx_featured_listing_data['yearBuilt'] : '');
-		update_post_meta($id, '_listing_bedrooms', $idx_featured_listing_data['bedrooms']);
-		update_post_meta($id, '_listing_bathrooms', $idx_featured_listing_data['totalBaths']);
-		update_post_meta($id, '_listing_half_bath', $idx_featured_listing_data['partialBaths']);
+		update_post_meta( $id, '_listing_lot_sqft', isset( $idx_featured_listing_data['lotSqFt'] ) ? $idx_featured_listing_data['lotSqFt'] : $idx_featured_listing_data['acres'] . ' acres' );
+		update_post_meta( $id, '_listing_acres', $idx_featured_listing_data['acres'] );
+		update_post_meta( $id, '_listing_price', $idx_featured_listing_data['listingPrice'] );
+		update_post_meta( $id, '_listing_address', $idx_featured_listing_data['address'] );
+		update_post_meta( $id, '_listing_city', $idx_featured_listing_data['cityName'] );
+		update_post_meta( $id, '_listing_county', $idx_featured_listing_data['countyName'] );
+		update_post_meta( $id, '_listing_state', $idx_featured_listing_data['state'] );
+		update_post_meta( $id, '_listing_zip', $idx_featured_listing_data['zipcode'] );
+		update_post_meta( $id, '_listing_mls', $idx_featured_listing_data['listingID'] );
+		update_post_meta( $id, '_listing_sqft', $idx_featured_listing_data['sqFt'] );
+		update_post_meta( $id, '_listing_year_built', ( isset( $idx_featured_listing_data['yearBuilt'] ) ) ? $idx_featured_listing_data['yearBuilt'] : '' );
+		update_post_meta( $id, '_listing_bedrooms', $idx_featured_listing_data['bedrooms'] );
+		update_post_meta( $id, '_listing_bathrooms', $idx_featured_listing_data['totalBaths'] );
+		update_post_meta( $id, '_listing_half_bath', $idx_featured_listing_data['partialBaths'] );
 
 		// Add post meta for Equity API fields
-		if (class_exists( 'Equity_Idx_Api' )) {
-			foreach ($idx_featured_listing_data as $metakey => $metavalue) {
-				if ($update == true && $metakey != 'price') {
-					delete_post_meta($id, '_listing_' . strtolower($metakey));
+		if ( class_exists( 'Equity_Idx_Api' ) ) {
+			foreach ( $idx_featured_listing_data as $metakey => $metavalue ) {
+				if ( $update == true && $metakey != 'price' ) {
+					delete_post_meta( $id, '_listing_' . strtolower( $metakey ) );
 				}
-				if(isset($metavalue) && !is_array($metavalue) && $metavalue != '' && $metakey != 'price') {
-					update_post_meta($id, '_listing_' . strtolower($metakey), $metavalue);
-				} elseif(isset( $metavalue ) && is_array( $metavalue )) {
-					foreach ($metavalue as $key => $value) {
-						if(get_post_meta($id, '_listing_' . strtolower($metakey)) && $metakey != 'images' && $metakey != 'disclaimer' && $metakey != 'courtesy') {
-							$oldvalue = get_post_meta($id, '_listing_' . strtolower($metakey), true);
+				if ( isset( $metavalue ) && ! is_array( $metavalue ) && $metavalue != '' && $metakey != 'price' ) {
+					update_post_meta( $id, '_listing_' . strtolower( $metakey ), $metavalue );
+				} elseif ( isset( $metavalue ) && is_array( $metavalue ) ) {
+					foreach ( $metavalue as $key => $value ) {
+						if ( get_post_meta( $id, '_listing_' . strtolower( $metakey ) ) && $metakey != 'images' && $metakey != 'disclaimer' && $metakey != 'courtesy' ) {
+							$oldvalue = get_post_meta( $id, '_listing_' . strtolower( $metakey ), true );
 							$newvalue = $value . ', ' . $oldvalue;
-							update_post_meta($id, '_listing_' . strtolower($metakey), $newvalue);
-						} elseif($metakey != 'images') {
-							update_post_meta($id, '_listing_' . strtolower($metakey), $value);
+							update_post_meta( $id, '_listing_' . strtolower( $metakey ), $newvalue );
+						} elseif ( $metakey != 'images' ) {
+							update_post_meta( $id, '_listing_' . strtolower( $metakey ), $value );
 						}
 					}
 				}
@@ -347,34 +363,34 @@ public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listi
 		}
 
 		// Add disclaimers and courtesies
-		foreach($idx_featured_listing_data['disclaimer'] as $disclaimer) {
-			if(in_array('details', $disclaimer)) {
-				$disclaimer_logo = ($disclaimer['logoURL']) ? '<br /><img src="' . $disclaimer['logoURL'] . '" style="opacity: 1 !important; position: static !important;" />' : '';
+		foreach ( $idx_featured_listing_data['disclaimer'] as $disclaimer ) {
+			if ( in_array( 'details', $disclaimer ) ) {
+				$disclaimer_logo     = ( $disclaimer['logoURL'] ) ? '<br /><img src="' . $disclaimer['logoURL'] . '" style="opacity: 1 !important; position: static !important;" />' : '';
 				$disclaimer_combined = $disclaimer['text'] . $disclaimer_logo;
-				update_post_meta($id, '_listing_disclaimer', $disclaimer_combined);
+				update_post_meta( $id, '_listing_disclaimer', $disclaimer_combined );
 			}
-			if(in_array('widget', $disclaimer)) {
-				$disclaimer_logo = ($disclaimer['logoURL']) ? '<br /><img src="' . $disclaimer['logoURL'] . '" style="opacity: 1 !important; position: static !important;" />' : '';
+			if ( in_array( 'widget', $disclaimer ) ) {
+				$disclaimer_logo     = ( $disclaimer['logoURL'] ) ? '<br /><img src="' . $disclaimer['logoURL'] . '" style="opacity: 1 !important; position: static !important;" />' : '';
 				$disclaimer_combined = $disclaimer['text'] . $disclaimer_logo;
-				update_post_meta($id, '_listing_disclaimer_widget', $disclaimer_combined);
+				update_post_meta( $id, '_listing_disclaimer_widget', $disclaimer_combined );
 			}
 		}
 
-		foreach($idx_featured_listing_data['courtesy'] as $courtesy) {
-			if(in_array('details', $courtesy)) {
-				update_post_meta($id, '_listing_courtesy', $courtesy['text']);
+		foreach ( $idx_featured_listing_data['courtesy'] as $courtesy ) {
+			if ( in_array( 'details', $courtesy ) ) {
+				update_post_meta( $id, '_listing_courtesy', $courtesy['text'] );
 			}
-			if(in_array('widget', $courtesy)) {
-				update_post_meta($id, '_listing_courtesy_widget', $courtesy['text']);
+			if ( in_array( 'widget', $courtesy ) ) {
+				update_post_meta( $id, '_listing_courtesy_widget', $courtesy['text'] );
 			}
 		}
 
 		/**
 		 * Pull featured image if it's not an update or update image is set to true
 		 */
-		if($update == false || $update_image == true) {
+		if ( $update == false || $update_image == true ) {
 			// Delete previously attached image
-			if($update_image == true) {
+			if ( $update_image == true ) {
 				$post_featured_image_id = get_post_thumbnail_id( $id );
 				wp_delete_attachment( $post_featured_image_id );
 			}
@@ -382,19 +398,20 @@ public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listi
 			// Add Featured Image to Post
 			$image_url  = $featured_image; // Define the image URL here
 			$upload_dir = wp_upload_dir(); // Set upload folder
-			$image_data = file_get_contents($image_url); // Get image data
-			$filename   = basename($image_url.'/' . $idx_featured_listing_data['listingID'] . '.jpg'); // Create image file name
+			$image_data = file_get_contents( $image_url ); // Get image data
+			$filename   = basename( $image_url . '/' . $idx_featured_listing_data['listingID'] . '.jpg' ); // Create image file name
 
 			// Check folder permission and define file location
-			if( wp_mkdir_p( $upload_dir['path'] ) ) {
+			if ( wp_mkdir_p( $upload_dir['path'] ) ) {
 				$file = $upload_dir['path'] . '/' . $filename;
 			} else {
 				$file = $upload_dir['basedir'] . '/' . $filename;
 			}
 
 			// Create the image file on the server
-			if(!file_exists($file))
+			if ( ! file_exists( $file ) ) {
 				file_put_contents( $file, $image_data );
+			}
 
 			// Check image file type
 			$wp_filetype = wp_check_filetype( $filename, null );
@@ -404,14 +421,14 @@ public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listi
 				'post_mime_type' => $wp_filetype['type'],
 				'post_title'     => $idx_featured_listing_data['listingID'] . ' - ' . $idx_featured_listing_data['address'],
 				'post_content'   => '',
-				'post_status'    => 'inherit'
+				'post_status'    => 'inherit',
 			);
 
 			// Create the attachment
 			$attach_id = wp_insert_attachment( $attachment, $file, $id );
 
 			// Include image.php
-			require_once(ABSPATH . 'wp-admin/includes/image.php');
+			require_once ABSPATH . 'wp-admin/includes/image.php';
 
 			// Define attachment metadata
 			$attach_data = wp_generate_attachment_metadata( $attach_id, $file );
@@ -435,29 +452,30 @@ public static function wp_listings_idx_insert_post_meta($id, $idx_featured_listi
  * Enqueues scripts for display
  * Deletes post and post thumbnail via ajax
  */
-add_action( 'admin_menu', 'wp_listings_idx_listing_register_menu_page');
+add_action( 'admin_menu', 'wp_listings_idx_listing_register_menu_page' );
 function wp_listings_idx_listing_register_menu_page() {
 	add_submenu_page( 'edit.php?post_type=listing', __( 'Import IDX Listings', 'wp-listings' ), __( 'Import IDX Listings', 'wp-listings' ), 'manage_options', 'wplistings-idx-listing', 'wp_listings_idx_listing_setting_page' );
 	add_action( 'admin_init', 'wp_listings_idx_listing_register_settings' );
 }
 
 function wp_listings_idx_listing_register_settings() {
-	register_setting('wp_listings_idx_listing_settings_group', 'wp_listings_idx_featured_listing_options', 'wp_listings_idx_create_post_cron');
+	register_setting( 'wp_listings_idx_listing_settings_group', 'wp_listings_idx_featured_listing_options', 'wp_listings_idx_create_post_cron' );
 }
 
 /**
  * Do wp_cron job for importing listings
  */
-function wp_listings_idx_create_post_cron($listings) {
-	wp_schedule_single_event( time(), 'wp_listings_idx_create_post_cron_hook', array($listings) );
+function wp_listings_idx_create_post_cron( $listings ) {
+	wp_schedule_single_event( time(), 'wp_listings_idx_create_post_cron_hook', array( $listings ) );
 }
-add_action('wp_listings_idx_create_post_cron_hook', array('WPL_Idx_Listing', 'wp_listings_idx_create_post'));
+add_action( 'wp_listings_idx_create_post_cron_hook', array( 'WPL_Idx_Listing', 'wp_listings_idx_create_post' ) );
 
 add_action( 'admin_enqueue_scripts', 'wp_listings_idx_listing_scripts' );
 function wp_listings_idx_listing_scripts() {
 	$screen = get_current_screen();
-	if($screen->id != 'listing_page_wplistings-idx-listing')
+	if ( $screen->id != 'listing_page_wplistings-idx-listing' ) {
 		return;
+	}
 
 	wp_enqueue_script( 'jquery-masonry' );
 	wp_enqueue_script( 'wp_listings_idx_listing_lazyload', WP_LISTINGS_URL . 'includes/js/jquery.lazyload.min.js', array( 'jquery' ), true );
@@ -467,18 +485,17 @@ function wp_listings_idx_listing_scripts() {
 	wp_enqueue_style( 'wp_listings_idx_listing_style', WP_LISTINGS_URL . 'includes/css/wp-listings-import.css' );
 }
 add_action( 'wp_ajax_wp_listings_idx_listing_delete', 'wp_listings_idx_listing_delete' );
-function wp_listings_idx_listing_delete(){
+function wp_listings_idx_listing_delete() {
 
 	$permission = check_ajax_referer( 'wp_listings_idx_listing_delete_nonce', 'nonce', false );
-	if( $permission == false ) {
+	if ( $permission == false ) {
 		echo 'error';
-	}
-	else {
+	} else {
 		// Delete featured image
 		$post_featured_image_id = get_post_thumbnail_id( $_REQUEST['id'] );
 		wp_delete_attachment( $post_featured_image_id );
 
-		//Delete post
+		// Delete post
 		wp_delete_post( $_REQUEST['id'] );
 		echo 'success';
 	}
@@ -486,37 +503,36 @@ function wp_listings_idx_listing_delete(){
 }
 
 add_action( 'wp_ajax_wp_listings_idx_listing_delete_all', 'wp_listings_idx_listing_delete_all' );
-function wp_listings_idx_listing_delete_all(){
+function wp_listings_idx_listing_delete_all() {
 
 	$permission = check_ajax_referer( 'wp_listings_idx_listing_delete_all_nonce', 'nonce', false );
-	if( $permission == false ) {
+	if ( $permission == false ) {
 		echo 'error';
-	}
-	else {
+	} else {
 		// Get listings
-		$idx_featured_listing_wp_options = get_option('wp_listings_idx_featured_listing_wp_options');
+		$idx_featured_listing_wp_options = get_option( 'wp_listings_idx_featured_listing_wp_options' );
 
-		foreach($idx_featured_listing_wp_options as $prop) {
-			if(isset($prop['post_id'])) {
+		foreach ( $idx_featured_listing_wp_options as $prop ) {
+			if ( isset( $prop['post_id'] ) ) {
 				// Delete featured image
 				$post_featured_image_id = get_post_thumbnail_id( $prop['post_id'] );
 				wp_delete_attachment( $post_featured_image_id );
 
-				//Delete post
+				// Delete post
 				wp_delete_post( $prop['post_id'] );
 			}
 		}
-		
+
 		echo 'success';
 	}
 	die();
 }
 
 function wp_listings_idx_listing_setting_page() {
-	if( get_option('wp_listings_import_progress') == true ) {
-		add_settings_error('wp_listings_idx_listing_settings_group', 'idx_listing_import_progress', 'Your listings are being imported in the background. This notice will dismiss when all selected listings have been imported.', 'updated');
+	if ( get_option( 'wp_listings_import_progress' ) == true ) {
+		add_settings_error( 'wp_listings_idx_listing_settings_group', 'idx_listing_import_progress', 'Your listings are being imported in the background. This notice will dismiss when all selected listings have been imported.', 'updated' );
 	}
-	$idx_featured_listing_wp_options = get_option('wp_listings_idx_featured_listing_wp_options');
+	$idx_featured_listing_wp_options = get_option( 'wp_listings_idx_featured_listing_wp_options' );
 
 	?>
 			<h1>Import IDX Listings</h1>
@@ -525,21 +541,20 @@ function wp_listings_idx_listing_setting_page() {
 			<label for="selectall"><input type="checkbox" id="selectall"/>Select/Deselect All<br/><em>If importing all listings, it may take some time. <strong class="error">Please be patient.</strong></em></label>
 			
 			<?php
-			if ($idx_featured_listing_wp_options) {
-				foreach($idx_featured_listing_wp_options as $prop) {
-					if(isset($prop['post_id'])) {
-						$nonce_all = wp_create_nonce('wp_listings_idx_listing_delete_all_nonce');
-						echo '<a class="delete-all" href="admin-ajax.php?action=wp_listings_idx_delete_all&nonce=' . $nonce_all . '" data-nonce="' . $nonce_all .'">Delete All Imported Listings</a>';
+			if ( $idx_featured_listing_wp_options ) {
+				foreach ( $idx_featured_listing_wp_options as $prop ) {
+					if ( isset( $prop['post_id'] ) ) {
+						$nonce_all = wp_create_nonce( 'wp_listings_idx_listing_delete_all_nonce' );
+						echo '<a class="delete-all" href="admin-ajax.php?action=wp_listings_idx_delete_all&nonce=' . $nonce_all . '" data-nonce="' . $nonce_all . '">Delete All Imported Listings</a>';
 						break;
 					}
 				}
 			}
 
-			submit_button('Import Listings');
-
+			submit_button( 'Import Listings' );
 
 			// Show popup if IDX Broker plugin not active or installed
-			if( !class_exists( 'IDX_Broker_Plugin') ) {
+			if ( ! class_exists( 'IDX_Broker_Plugin' ) ) {
 				// thickbox like content
 				echo '
 					<img class="idx-import bkg" src="' . WP_LISTINGS_URL . 'images/import-bg.jpg' . '" /></a>
@@ -550,7 +565,7 @@ function wp_listings_idx_listing_setting_page() {
 				return;
 			}
 
-			settings_errors('wp_listings_idx_listing_settings_group');
+			settings_errors( 'wp_listings_idx_listing_settings_group' );
 			?>
 
 			<ol id="selectable" class="grid">
@@ -561,20 +576,20 @@ function wp_listings_idx_listing_setting_page() {
 			$plugin_data = get_plugins();
 
 			// Get properties from IDX Broker plugin
-			if (class_exists( 'IDX_Broker_Plugin' )) {
+			if ( class_exists( 'IDX_Broker_Plugin' ) ) {
 				// bail if IDX plugin version is not at least 2.0
-				if($plugin_data['idx-broker-platinum/idx-broker-platinum.php']['Version'] < 2.0 ) {
-					add_settings_error('wp_listings_idx_listing_settings_group', 'idx_listing_update', 'You must update to <a href="' . admin_url( 'update-core.php' ) . '">IMPress for IDX Broker</a> version 2.0.0 or higher to import listings.', 'error');
-					settings_errors('wp_listings_idx_listing_settings_group');
+				if ( $plugin_data['idx-broker-platinum/idx-broker-platinum.php']['Version'] < 2.0 ) {
+					add_settings_error( 'wp_listings_idx_listing_settings_group', 'idx_listing_update', 'You must update to <a href="' . admin_url( 'update-core.php' ) . '">IMPress for IDX Broker</a> version 2.0.0 or higher to import listings.', 'error' );
+					settings_errors( 'wp_listings_idx_listing_settings_group' );
 					return;
 				}
 
-				$_idx_api = new \IDX\Idx_Api();
-				$properties = $_idx_api->client_properties('featured');
-			} elseif(is_wp_error($properties)) {
+				$_idx_api   = new \IDX\Idx_Api();
+				$properties = $_idx_api->client_properties( 'featured' );
+			} elseif ( is_wp_error( $properties ) ) {
 				 $error_string = $properties->get_error_message();
-				add_settings_error('wp_listings_idx_listing_settings_group', 'idx_listing_update', $error_string, 'error');
-				settings_errors('wp_listings_idx_listing_settings_group');
+				add_settings_error( 'wp_listings_idx_listing_settings_group', 'idx_listing_update', $error_string, 'error' );
+				settings_errors( 'wp_listings_idx_listing_settings_group' );
 				return;
 			} else {
 				return;
@@ -584,47 +599,49 @@ function wp_listings_idx_listing_setting_page() {
 			do_settings_sections( 'wp_listings_idx_listing_settings_group' );
 
 			// No featured properties found
-			if(!$properties) {
+			if ( ! $properties ) {
 				echo 'No featured properties found.';
 				return;
 			}
 
 			// Loop through properties
-			foreach ($properties as $prop) {
+			foreach ( $properties as $prop ) {
 
-				if(!isset($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) || !get_post($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) ) {
-					$idx_featured_listing_wp_options[$prop['listingID']] = array(
-						'listingID' => $prop['listingID']
-						);
+				if ( ! isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) || ! get_post( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) ) {
+					$idx_featured_listing_wp_options[ $prop['listingID'] ] = array(
+						'listingID' => $prop['listingID'],
+					);
 				}
 
-				if(isset($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) && get_post($idx_featured_listing_wp_options[$prop['listingID']]['post_id']) ) {
-					$pid = $idx_featured_listing_wp_options[$prop['listingID']]['post_id'];
-					$nonce = wp_create_nonce('wp_listings_idx_listing_delete_nonce');
-					$delete_listing = sprintf('<a href="%s" data-id="%s" data-nonce="%s" class="delete-post">Delete</a>',
-						admin_url( 'admin-ajax.php?action=wp_listings_idx_listing_delete&id=' . $pid . '&nonce=' . $nonce),
-							$pid,
-							$nonce
-					 );
+				if ( isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) && get_post( $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'] ) ) {
+					$pid            = $idx_featured_listing_wp_options[ $prop['listingID'] ]['post_id'];
+					$nonce          = wp_create_nonce( 'wp_listings_idx_listing_delete_nonce' );
+					$delete_listing = sprintf(
+						'<a href="%s" data-id="%s" data-nonce="%s" class="delete-post">Delete</a>',
+						admin_url( 'admin-ajax.php?action=wp_listings_idx_listing_delete&id=' . $pid . '&nonce=' . $nonce ),
+						$pid,
+						$nonce
+					);
 				}
 
-				printf('<div class="grid-item post"><label for="%s" class="idx-listing"><li class="%s"><img class="listing lazy" data-original="%s"><input type="checkbox" id="%s" class="checkbox" name="wp_listings_idx_featured_listing_options[]" value="%s" %s />%s<p><span class="price">%s</span><br/><span class="address">%s</span><br/><span class="mls">MLS#: </span>%s</p>%s</li></label></div>',
+				printf(
+					'<div class="grid-item post"><label for="%s" class="idx-listing"><li class="%s"><img class="listing lazy" data-original="%s"><input type="checkbox" id="%s" class="checkbox" name="wp_listings_idx_featured_listing_options[]" value="%s" %s />%s<p><span class="price">%s</span><br/><span class="address">%s</span><br/><span class="mls">MLS#: </span>%s</p>%s</li></label></div>',
 					$prop['listingID'],
-					isset($idx_featured_listing_wp_options[$prop['listingID']]['status']) ? ($idx_featured_listing_wp_options[$prop['listingID']]['status'] == 'publish' ? "imported" : '') : '',
-					isset($prop['image']['0']['url']) ? $prop['image']['0']['url'] : '//mlsphotos.idxbroker.com/defaultNoPhoto/noPhotoFull.png',
+					isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] ) ? ( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] == 'publish' ? 'imported' : '' ) : '',
+					isset( $prop['image']['0']['url'] ) ? $prop['image']['0']['url'] : '//mlsphotos.idxbroker.com/defaultNoPhoto/noPhotoFull.png',
 					$prop['listingID'],
 					$prop['listingID'],
-					isset($idx_featured_listing_wp_options[$prop['listingID']]['status']) ? ($idx_featured_listing_wp_options[$prop['listingID']]['status'] == 'publish' ? "checked" : '') : '',
-					isset($idx_featured_listing_wp_options[$prop['listingID']]['status']) ? ($idx_featured_listing_wp_options[$prop['listingID']]['status'] == 'publish' ? "<span class='imported'><i class='dashicons dashicons-yes'></i>Imported</span>" : '') : '',
+					isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] ) ? ( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] == 'publish' ? 'checked' : '' ) : '',
+					isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] ) ? ( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] == 'publish' ? "<span class='imported'><i class='dashicons dashicons-yes'></i>Imported</span>" : '' ) : '',
 					$prop['listingPrice'],
 					$prop['address'],
 					$prop['listingID'],
-					isset($idx_featured_listing_wp_options[$prop['listingID']]['status']) ? ($idx_featured_listing_wp_options[$prop['listingID']]['status'] == 'publish' ? $delete_listing : '') : ''
-					);
+					isset( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] ) ? ( $idx_featured_listing_wp_options[ $prop['listingID'] ]['status'] == 'publish' ? $delete_listing : '' ) : ''
+				);
 
 			}
 			echo '</ol>';
-			submit_button('Import Listings');
+			submit_button( 'Import Listings' );
 			?>
 			</form>
 	<?php
@@ -634,49 +651,51 @@ function wp_listings_idx_listing_setting_page() {
  * Check if update is scheduled - if not, schedule it to run twice daily.
  * Schedule auto import if option checked
  * Only add if IDX plugin is installed
+ *
  * @since 2.0
  */
-if( class_exists( 'IDX_Broker_Plugin') ) {
+if ( class_exists( 'IDX_Broker_Plugin' ) ) {
 	add_action( 'admin_init', 'wp_listings_idx_update_schedule' );
 
-	$wpl_options = get_option('plugin_wp_listings_settings');
+	$wpl_options = get_option( 'plugin_wp_listings_settings' );
 
-	if ( isset($wpl_options['wp_listings_auto_import']) && $wpl_options['wp_listings_auto_import'] == true ) {
+	if ( isset( $wpl_options['wp_listings_auto_import'] ) && $wpl_options['wp_listings_auto_import'] == true ) {
 		add_action( 'admin_init', 'wp_listings_idx_auto_import_schedule' );
 	}
 }
 function wp_listings_idx_update_schedule() {
 	if ( ! wp_next_scheduled( 'wp_listings_idx_update' ) ) {
-		wp_schedule_event( time(), 'twicedaily', 'wp_listings_idx_update');
+		wp_schedule_event( time(), 'twicedaily', 'wp_listings_idx_update' );
 	}
 }
 /**
  * On the scheduled update event, run wp_listings_update_post
  */
-add_action( 'wp_listings_idx_update', array('WPL_Idx_Listing', 'wp_listings_update_post') );
+add_action( 'wp_listings_idx_update', array( 'WPL_Idx_Listing', 'wp_listings_update_post' ) );
 
 /**
  * Schedule auto import task
  */
 function wp_listings_idx_auto_import_schedule() {
 	if ( ! wp_next_scheduled( 'wp_listings_idx_auto_import' ) ) {
-		wp_schedule_event( time(), 'twicedaily', 'wp_listings_idx_auto_import');
+		wp_schedule_event( time(), 'twicedaily', 'wp_listings_idx_auto_import' );
 	}
 }
 add_action( 'wp_listings_idx_auto_import', 'wp_listings_idx_auto_import_task' );
 /**
  * Get listingIDs and pass to create post cron job
+ *
  * @return void
  */
 function wp_listings_idx_auto_import_task() {
-	if(class_exists( 'IDX_Broker_Plugin')) {
-		require_once(ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php');
-		$_idx_api = new \IDX\Idx_Api();
-		$properties = $_idx_api->client_properties('featured');
+	if ( class_exists( 'IDX_Broker_Plugin' ) ) {
+		require_once ABSPATH . 'wp-content/plugins/idx-broker-platinum/idx/idx-api.php';
+		$_idx_api   = new \IDX\Idx_Api();
+		$properties = $_idx_api->client_properties( 'featured' );
 
-		foreach($properties as $prop) {
+		foreach ( $properties as $prop ) {
 			$listingIDs[] = $prop['listingID'];
 		}
 	}
-	wp_listings_idx_create_post_cron($listingIDs);
+	wp_listings_idx_create_post_cron( $listingIDs );
 }
diff --git a/includes/class-listing-template.php b/includes/class-listing-template.php
index b7f3852..5c7d3e8 100755
--- a/includes/class-listing-template.php
+++ b/includes/class-listing-template.php
@@ -24,15 +24,16 @@ function __construct() {
 
 	function get_listing_templates() {
 
-		$templates = wp_get_theme()->get_files( 'php', 1 );
+		$templates         = wp_get_theme()->get_files( 'php', 1 );
 		$listing_templates = array();
 
 		$base = array( trailingslashit( get_template_directory() ), trailingslashit( get_stylesheet_directory() ) );
 
 		foreach ( (array) $templates as $file => $full_path ) {
 
-			if ( ! preg_match( '|Single Listing Template:(.*)$|mi', file_get_contents( $full_path ), $header ) )
+			if ( ! preg_match( '|Single Listing Template:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
 				continue;
+			}
 
 			$listing_templates[ $file ] = _cleanup_header_comment( $header[1] );
 
@@ -51,7 +52,7 @@ function listing_templates_dropdown() {
 		/** Loop through templates, make them options */
 		foreach ( (array) $listing_templates as $template_file => $template_name ) {
 			$selected = ( $template_file == get_post_meta( $post->ID, '_wp_post_template', true ) ) ? ' selected="selected"' : '';
-			$opt = '<option value="' . esc_attr( $template_file ) . '"' . $selected . '>' . esc_html( $template_name ) . '</option>';
+			$opt      = '<option value="' . esc_attr( $template_file ) . '"' . $selected . '>' . esc_html( $template_name ) . '</option>';
 			echo $opt;
 		}
 
@@ -66,7 +67,7 @@ function listing_template_metabox( $post ) {
 		?>
 		<input type="hidden" name="wplistings_single_noncename" id="wplistings_single_noncename" value="<?php echo wp_create_nonce( plugin_basename( __FILE__ ) ); ?>" />
 
-		<label class="hidden" for="listing_template"><?php  _e( 'Listing Template', 'wp-listings' ); ?></label><br />
+		<label class="hidden" for="listing_template"><?php _e( 'Listing Template', 'wp-listings' ); ?></label><br />
 		<select name="_wp_post_template" id="listing_template" class="dropdown">
 			<option value=""><?php _e( 'Default', 'wp-listings' ); ?></option>
 			<?php $this->listing_templates_dropdown(); ?>
@@ -82,16 +83,18 @@ function metabox_save( $post_id, $post ) {
 		 * Verify this came from our screen and with proper authorization,
 		 * because save_post can be triggered at other times
 		 */
-		if ( !isset( $_POST['wplistings_single_noncename'] ) || ! wp_verify_nonce( $_POST['wplistings_single_noncename'], plugin_basename( __FILE__ ) ) )
+		if ( ! isset( $_POST['wplistings_single_noncename'] ) || ! wp_verify_nonce( $_POST['wplistings_single_noncename'], plugin_basename( __FILE__ ) ) ) {
 			return $post->ID;
+		}
 
 		/** Is the user allowed to edit the post or page? */
-		if ( 'listing' == $_POST['post_type'] )
-			if ( ! current_user_can( 'edit_page', $post->ID ) )
+		if ( 'listing' == $_POST['post_type'] ) {
+			if ( ! current_user_can( 'edit_page', $post->ID ) ) {
 				return $post->ID;
-		else
-			if ( ! current_user_can( 'edit_post', $post->ID ) )
+			} elseif ( ! current_user_can( 'edit_post', $post->ID ) ) {
 				return $post->ID;
+			}
+		}
 
 		/** OK, we're authenticated: we need to find and save the data */
 
@@ -101,23 +104,26 @@ function metabox_save( $post_id, $post ) {
 		/** Add values of $mydata as custom fields */
 		foreach ( $mydata as $key => $value ) {
 			/** Don't store custom data twice */
-			if( 'revision' == $post->post_type )
+			if ( 'revision' == $post->post_type ) {
 				return;
+			}
 
 			/** If $value is an array, make it a CSV (unlikely) */
 			$value = implode( ',', (array) $value );
 
 			/** Update the data if it exists, or add it if it doesn't */
-			if( get_post_meta( $post->ID, $key, false ) )
+			if ( get_post_meta( $post->ID, $key, false ) ) {
 				update_post_meta( $post->ID, $key, $value );
-			else
+			} else {
 				add_post_meta( $post->ID, $key, $value );
+			}
 
 			/** Delete if blank */
-			if( ! $value )
+			if ( ! $value ) {
 				delete_post_meta( $post->ID, $key );
+			}
 		}
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/class-listings-search-widget.php b/includes/class-listings-search-widget.php
index 72174f0..92fe23c 100755
--- a/includes/class-listings-search-widget.php
+++ b/includes/class-listings-search-widget.php
@@ -8,17 +8,28 @@
 class WP_Listings_Search_Widget extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array( 'classname' => 'listings-search wp-listings-search', 'description' => __( 'Display listings search dropdown', 'wp-listings' ), 'customize_selective_refresh' => true );
-		$control_ops = array( 'width' => 300, 'height' => 350, 'id_base' => 'listings-search' );
+		$widget_ops  = array(
+			'classname'                   => 'listings-search wp-listings-search',
+			'description'                 => __( 'Display listings search dropdown', 'wp-listings' ),
+			'customize_selective_refresh' => true,
+		);
+		$control_ops = array(
+			'width'   => 300,
+			'height'  => 350,
+			'id_base' => 'listings-search',
+		);
 		parent::__construct( 'listings-search', __( 'IMPress Listings - Search', 'wp-listings' ), $widget_ops, $control_ops );
 	}
 
 	function widget( $args, $instance ) {
 
-		$instance = wp_parse_args( (array) $instance, array(
-			'title'			=> '',
-			'button_text'	=> __( 'Search Listings', 'wp-listings' )
-		) );
+		$instance = wp_parse_args(
+			(array) $instance,
+			array(
+				'title'       => '',
+				'button_text' => __( 'Search Listings', 'wp-listings' ),
+			)
+		);
 
 		global $_wp_listings_taxonomies;
 
@@ -28,28 +39,40 @@ function widget( $args, $instance ) {
 
 		echo $before_widget;
 
-		if ( $instance['title'] ) echo $before_title . apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base ) . $after_title;
+		if ( $instance['title'] ) {
+			echo $before_title . apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base ) . $after_title;
+		}
 
 		echo '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" ><input type="hidden" value="" name="s" /><input type="hidden" value="listing" name="post_type" />';
 
 		foreach ( $listings_taxonomies as $tax => $data ) {
-			if ( ! isset( $instance[$tax] ) || ! $instance[$tax] )
+			if ( ! isset( $instance[ $tax ] ) || ! $instance[ $tax ] ) {
 				continue;
-
-			$terms = get_terms( $tax, array( 'orderby' => 'title', 'number' => 100, 'hierarchical' => false ) );
-			if ( empty( $terms ) )
+			}
+
+			$terms = get_terms(
+				$tax,
+				array(
+					'orderby'      => 'title',
+					'number'       => 100,
+					'hierarchical' => false,
+				)
+			);
+			if ( empty( $terms ) ) {
 				continue;
+			}
 
-			$current = ! empty( $wp_query->query_vars[$tax] ) ? $wp_query->query_vars[$tax] : '';
+			$current = ! empty( $wp_query->query_vars[ $tax ] ) ? $wp_query->query_vars[ $tax ] : '';
 			echo "<select name='$tax' id='$tax' class='wp-listings-taxonomy'>\n\t";
 			echo '<option value="" ' . selected( $current == '', true, false ) . ">{$data['labels']['name']}</option>\n";
-			foreach ( (array) $terms as $term )
+			foreach ( (array) $terms as $term ) {
 				echo "\t<option value='{$term->slug}' " . selected( $current, $term->slug, false ) . ">{$term->name}</option>\n";
+			}
 
 			echo '</select>';
 		}
 
-		echo '<div class="btn-search"><button type="submit" class="searchsubmit"><i class="fa fa-search"></i><span class="button-text">'. esc_attr( $instance['button_text'] ) .'</span></button></div>';
+		echo '<div class="btn-search"><button type="submit" class="searchsubmit"><i class="fa fa-search"></i><span class="button-text">' . esc_attr( $instance['button_text'] ) . '</span></button></div>';
 		echo '<div class="clear"></div>
 		</form>';
 
@@ -63,15 +86,18 @@ function update( $new_instance, $old_instance ) {
 
 	function form( $instance ) {
 
-		$instance = wp_parse_args( (array) $instance, array(
-			'title'			=> '',
-			'button_text'	=> __( 'Search Listings', 'wp-listings' )
-		) );
+		$instance = wp_parse_args(
+			(array) $instance,
+			array(
+				'title'       => '',
+				'button_text' => __( 'Search Listings', 'wp-listings' ),
+			)
+		);
 
 		global $_wp_listings_taxonomies;
 
 		$listings_taxonomies = $_wp_listings_taxonomies->get_taxonomies();
-		$new_widget = empty( $instance );
+		$new_widget          = empty( $instance );
 
 		printf( '<p><label for="%s">%s</label><input type="text" id="%s" name="%s" value="%s" style="%s" /></p>', $this->get_field_id( 'title' ), __( 'Title:', 'wp-listings' ), $this->get_field_id( 'title' ), $this->get_field_name( 'title' ), esc_attr( $instance['title'] ), 'width: 95%;' );
 		?>
@@ -79,8 +105,9 @@ function form( $instance ) {
 		<?php
 		foreach ( (array) $listings_taxonomies as $tax => $data ) {
 			$terms = get_terms( $tax );
-			if ( empty( $terms ) )
+			if ( empty( $terms ) ) {
 				continue;
+			}
 
 			$checked = isset( $instance[ $tax ] ) && $instance[ $tax ];
 
diff --git a/includes/class-listings.php b/includes/class-listings.php
index d70389c..5a1bf51 100755
--- a/includes/class-listings.php
+++ b/includes/class-listings.php
@@ -6,13 +6,12 @@
 /**
  * This class handles the creation of the "Listings" post type, and creates a
  * UI to display the Listing-specific data on the admin screens.
- *
  */
 class WP_Listings {
 
-	var $settings_page = 'wp-listings-settings';
+	var $settings_page  = 'wp-listings-settings';
 	var $settings_field = 'wp_listings_taxonomies';
-	var $menu_page = 'register-taxonomies';
+	var $menu_page      = 'register-taxonomies';
 
 	var $options;
 
@@ -26,61 +25,67 @@ class WP_Listings {
 	 */
 	function __construct() {
 
-		$this->options = get_option('plugin_wp_listings_settings');
-
-		$this->property_details = apply_filters( 'wp_listings_property_details', array(
-			'col1' => array(
-			    __( 'Price:', 'wp-listings' ) 					=> '_listing_price',
-			    __( 'Address:', 'wp-listings' )					=> '_listing_address',
-			    __( 'City:', 'wp-listings' )					=> '_listing_city',
-			    __( 'County:', 'wp-listings' )					=> '_listing_county',
-			    __( 'State:', 'wp-listings' )					=> '_listing_state',
-			    __( 'Country:', 'wp-listings' )					=> '_listing_country',
-			    __( 'ZIP:', 'wp-listings' )						=> '_listing_zip',
-			    __( 'MLS #:', 'wp-listings' ) 					=> '_listing_mls',
-				__( 'Open House Time & Date:', 'wp-listings' ) 	=> '_listing_open_house'
-			),
-			'col2' => array(
-			    __( 'Year Built:', 'wp-listings' ) 				=> '_listing_year_built',
-			    __( 'Floors:', 'wp-listings' ) 					=> '_listing_floors',
-			    __( 'Square Feet:', 'wp-listings' )				=> '_listing_sqft',
-			    __( 'Acres:', 'wp-listings' )					=> '_listing_acres',
-				__( 'Lot Square Feet:', 'wp-listings' )			=> '_listing_lot_sqft',
-			    __( 'Bedrooms:', 'wp-listings' )				=> '_listing_bedrooms',
-			    __( 'Bathrooms:', 'wp-listings' )				=> '_listing_bathrooms',
-			    __( 'Half Bathrooms:', 'wp-listings' )			=> '_listing_half_bath',
-			    __( 'Garage:', 'wp-listings' )					=> '_listing_garage',
-			    __( 'Pool:', 'wp-listings' )					=> '_listing_pool'
-			),
-		) );
-
-		$this->extended_property_details = apply_filters( 'wp_listings_extended_property_details', array(
-			'col1' => array(
-			    __( 'Property Type:', 'wp-listings' ) 			=> '_listing_proptype',
-			    __( 'Condo:', 'wp-listings' )					=> '_listing_condo',
-			    __( 'Financial:', 'wp-listings' )				=> '_listing_financial',
-			    __( 'Condition:', 'wp-listings' )				=> '_listing_condition',
-			    __( 'Construction:', 'wp-listings' )			=> '_listing_construction',
-			    __( 'Exterior:', 'wp-listings' )				=> '_listing_exterior',
-			    __( 'Fencing:', 'wp-listings' ) 				=> '_listing_fencing',
-				__( 'Interior:', 'wp-listings' ) 				=> '_listing_interior',
-				__( 'Flooring:', 'wp-listings' ) 				=> '_listing_flooring',
-				__( 'Heat/Cool:', 'wp-listings' ) 				=> '_listing_heatcool'
-			),
-			'col2' => array(
-				__( 'Lot size:', 'wp-listings' ) 				=> '_listing_lotsize',
-				__( 'Location:', 'wp-listings' ) 				=> '_listing_location',
-				__( 'Scenery:', 'wp-listings' )					=> '_listing_scenery',
-				__( 'Community:', 'wp-listings' )				=> '_listing_community',
-				__( 'Recreation:', 'wp-listings' )				=> '_listing_recreation',
-				__( 'General:', 'wp-listings' )					=> '_listing_general',
-				__( 'Inclusions:', 'wp-listings' )				=> '_listing_inclusions',
-				__( 'Parking:', 'wp-listings' )					=> '_listing_parking',
-				__( 'Rooms:', 'wp-listings' )					=> '_listing_rooms',
-				__( 'Laundry:', 'wp-listings' )					=> '_listing_laundry',
-				__( 'Utilities:', 'wp-listings' )				=> '_listing_utilities'
-			),
-		) );
+		$this->options = get_option( 'plugin_wp_listings_settings' );
+
+		$this->property_details = apply_filters(
+			'wp_listings_property_details',
+			array(
+				'col1' => array(
+					__( 'Price:', 'wp-listings' )   => '_listing_price',
+					__( 'Address:', 'wp-listings' ) => '_listing_address',
+					__( 'City:', 'wp-listings' )    => '_listing_city',
+					__( 'County:', 'wp-listings' )  => '_listing_county',
+					__( 'State:', 'wp-listings' )   => '_listing_state',
+					__( 'Country:', 'wp-listings' ) => '_listing_country',
+					__( 'ZIP:', 'wp-listings' )     => '_listing_zip',
+					__( 'MLS #:', 'wp-listings' )   => '_listing_mls',
+					__( 'Open House Time & Date:', 'wp-listings' ) => '_listing_open_house',
+				),
+				'col2' => array(
+					__( 'Year Built:', 'wp-listings' )     => '_listing_year_built',
+					__( 'Floors:', 'wp-listings' )         => '_listing_floors',
+					__( 'Square Feet:', 'wp-listings' )    => '_listing_sqft',
+					__( 'Acres:', 'wp-listings' )          => '_listing_acres',
+					__( 'Lot Square Feet:', 'wp-listings' ) => '_listing_lot_sqft',
+					__( 'Bedrooms:', 'wp-listings' )       => '_listing_bedrooms',
+					__( 'Bathrooms:', 'wp-listings' )      => '_listing_bathrooms',
+					__( 'Half Bathrooms:', 'wp-listings' ) => '_listing_half_bath',
+					__( 'Garage:', 'wp-listings' )         => '_listing_garage',
+					__( 'Pool:', 'wp-listings' )           => '_listing_pool',
+				),
+			)
+		);
+
+		$this->extended_property_details = apply_filters(
+			'wp_listings_extended_property_details',
+			array(
+				'col1' => array(
+					__( 'Property Type:', 'wp-listings' ) => '_listing_proptype',
+					__( 'Condo:', 'wp-listings' )         => '_listing_condo',
+					__( 'Financial:', 'wp-listings' )     => '_listing_financial',
+					__( 'Condition:', 'wp-listings' )     => '_listing_condition',
+					__( 'Construction:', 'wp-listings' )  => '_listing_construction',
+					__( 'Exterior:', 'wp-listings' )      => '_listing_exterior',
+					__( 'Fencing:', 'wp-listings' )       => '_listing_fencing',
+					__( 'Interior:', 'wp-listings' )      => '_listing_interior',
+					__( 'Flooring:', 'wp-listings' )      => '_listing_flooring',
+					__( 'Heat/Cool:', 'wp-listings' )     => '_listing_heatcool',
+				),
+				'col2' => array(
+					__( 'Lot size:', 'wp-listings' )   => '_listing_lotsize',
+					__( 'Location:', 'wp-listings' )   => '_listing_location',
+					__( 'Scenery:', 'wp-listings' )    => '_listing_scenery',
+					__( 'Community:', 'wp-listings' )  => '_listing_community',
+					__( 'Recreation:', 'wp-listings' ) => '_listing_recreation',
+					__( 'General:', 'wp-listings' )    => '_listing_general',
+					__( 'Inclusions:', 'wp-listings' ) => '_listing_inclusions',
+					__( 'Parking:', 'wp-listings' )    => '_listing_parking',
+					__( 'Rooms:', 'wp-listings' )      => '_listing_rooms',
+					__( 'Laundry:', 'wp-listings' )    => '_listing_laundry',
+					__( 'Utilities:', 'wp-listings' )  => '_listing_utilities',
+				),
+			)
+		);
 
 		add_action( 'init', array( $this, 'create_post_type' ) );
 
@@ -113,10 +118,10 @@ function add_options() {
 
 		$new_options = array(
 			'wp_listings_archive_posts_num' => 9,
-			'wp_listings_slug' => 'listings'
+			'wp_listings_slug'              => 'listings',
 		);
 
-		if ( empty($this->options['wp_listings_slug']) && empty($this->options['wp_listings_archive_posts_num']) )  {
+		if ( empty( $this->options['wp_listings_slug'] ) && empty( $this->options['wp_listings_archive_posts_num'] ) ) {
 			add_option( 'plugin_wp_listings_settings', $new_options );
 		}
 
@@ -133,7 +138,7 @@ function settings_init() {
 	 * Creates display of settings page along with form fields
 	 */
 	function settings_page() {
-		include( dirname( __FILE__ ) . '/views/wp-listings-settings.php' );
+		include dirname( __FILE__ ) . '/views/wp-listings-settings.php';
 	}
 
 	/**
@@ -141,35 +146,40 @@ function settings_page() {
 	 */
 	function create_post_type() {
 
-		$args = apply_filters( 'wp_listings_post_type_args',
+		$args = apply_filters(
+			'wp_listings_post_type_args',
 			array(
-				'labels' => array(
-					'name'					=> __( 'Listings', 'wp-listings' ),
-					'singular_name'			=> __( 'Listing', 'wp-listings' ),
-					'add_new'				=> __( 'Add New', 'wp-listings' ),
-					'add_new_item'			=> __( 'Add New Listing', 'wp-listings' ),
-					'edit'					=> __( 'Edit', 'wp-listings' ),
-					'edit_item'				=> __( 'Edit Listing', 'wp-listings' ),
-					'new_item'				=> __( 'New Listing', 'wp-listings' ),
-					'view'					=> __( 'View Listing', 'wp-listings' ),
-					'view_item'				=> __( 'View Listing', 'wp-listings' ),
-					'search_items'			=> __( 'Search Listings', 'wp-listings' ),
-					'not_found'				=> __( 'No listings found', 'wp-listings' ),
-					'not_found_in_trash'	=> __( 'No listings found in Trash', 'wp-listings' ),
+				'labels'                => array(
+					'name'                  => __( 'Listings', 'wp-listings' ),
+					'singular_name'         => __( 'Listing', 'wp-listings' ),
+					'add_new'               => __( 'Add New', 'wp-listings' ),
+					'add_new_item'          => __( 'Add New Listing', 'wp-listings' ),
+					'edit'                  => __( 'Edit', 'wp-listings' ),
+					'edit_item'             => __( 'Edit Listing', 'wp-listings' ),
+					'new_item'              => __( 'New Listing', 'wp-listings' ),
+					'view'                  => __( 'View Listing', 'wp-listings' ),
+					'view_item'             => __( 'View Listing', 'wp-listings' ),
+					'search_items'          => __( 'Search Listings', 'wp-listings' ),
+					'not_found'             => __( 'No listings found', 'wp-listings' ),
+					'not_found_in_trash'    => __( 'No listings found in Trash', 'wp-listings' ),
 					'filter_items_list'     => __( 'Filter Listings', 'wp-listings' ),
 					'items_list_navigation' => __( 'Listings navigation', 'wp-listings' ),
-					'items_list'            => __( 'Listings list', 'wp-listings' )
+					'items_list'            => __( 'Listings list', 'wp-listings' ),
 				),
-				'public'		=> true,
-				'query_var'		=> true,
-				'show_in_rest'  => true,
-				'rest_base'     => 'listing',
+				'public'                => true,
+				'query_var'             => true,
+				'show_in_rest'          => true,
+				'rest_base'             => 'listing',
 				'rest_controller_class' => 'WP_REST_Posts_Controller',
-				'menu_position'	=> 5,
-				'menu_icon'		=> 'dashicons-admin-home',
-				'has_archive'	=> true,
-				'supports'		=> array( 'title', 'editor', 'author', 'comments', 'excerpt', 'thumbnail', 'revisions', 'equity-layouts', 'equity-cpt-archives-settings', 'genesis-seo', 'genesis-layouts', 'genesis-simple-sidebars', 'genesis-cpt-archives-settings', 'publicize', 'wpcom-markdown'),
-				'rewrite'		=> array( 'slug' => $this->options['wp_listings_slug'], 'feeds' => true, 'with_front' => false ),
+				'menu_position'         => 5,
+				'menu_icon'             => 'dashicons-admin-home',
+				'has_archive'           => true,
+				'supports'              => array( 'title', 'editor', 'author', 'comments', 'excerpt', 'thumbnail', 'revisions', 'equity-layouts', 'equity-cpt-archives-settings', 'genesis-seo', 'genesis-layouts', 'genesis-simple-sidebars', 'genesis-cpt-archives-settings', 'publicize', 'wpcom-markdown' ),
+				'rewrite'               => array(
+					'slug'       => $this->options['wp_listings_slug'],
+					'feeds'      => true,
+					'with_front' => false,
+				),
 			)
 		);
 
@@ -180,79 +190,88 @@ function create_post_type() {
 	function register_meta_boxes() {
 		add_meta_box( 'listing_details_metabox', __( 'Property Details', 'wp-listings' ), array( &$this, 'listing_details_metabox' ), 'listing', 'normal', 'high' );
 		add_meta_box( 'listing_features_metabox', __( 'Additional Details', 'wp-listings' ), array( &$this, 'listing_features_metabox' ), 'listing', 'normal', 'high' );
-		if ( !class_exists( 'Idx_Broker_Plugin' ) ) {
+		if ( ! class_exists( 'Idx_Broker_Plugin' ) ) {
 			add_meta_box( 'idx_metabox', __( 'IDX Broker', 'wp-listings' ), array( &$this, 'idx_metabox' ), 'wp-listings-options', 'side', 'core' );
 		}
-		if( !function_exists( 'equity' ) ) {
+		if ( ! function_exists( 'equity' ) ) {
 			add_meta_box( 'agentevo_metabox', __( 'Equity Framework', 'wp-listings' ), array( &$this, 'agentevo_metabox' ), 'wp-listings-options', 'side', 'core' );
 		}
 
 	}
 
 	function listing_details_metabox() {
-		include( dirname( __FILE__ ) . '/views/listing-details-metabox.php' );
+		include dirname( __FILE__ ) . '/views/listing-details-metabox.php';
 	}
 
 	function listing_features_metabox() {
-		include( dirname( __FILE__ ) . '/views/listing-features-metabox.php' );
+		include dirname( __FILE__ ) . '/views/listing-features-metabox.php';
 	}
 
 	function agentevo_metabox() {
-		include( dirname( __FILE__ ) . '/views/agentevo-metabox.php' );
+		include dirname( __FILE__ ) . '/views/agentevo-metabox.php';
 	}
 
 	function idx_metabox() {
-		include( dirname( __FILE__ ) . '/views/idx-metabox.php' );
+		include dirname( __FILE__ ) . '/views/idx-metabox.php';
 	}
 
 	function metabox_save( $post_id, $post ) {
 
 		/** Run only on listings post type save */
-		if ( 'listing' != $post->post_type )
+		if ( 'listing' != $post->post_type ) {
 			return;
+		}
 
-		if ( !isset( $_POST['wp_listings_metabox_nonce'] ) || !wp_verify_nonce( $_POST['wp_listings_metabox_nonce'], 'wp_listings_metabox_save' ) )
-	        return $post_id;
+		if ( ! isset( $_POST['wp_listings_metabox_nonce'] ) || ! wp_verify_nonce( $_POST['wp_listings_metabox_nonce'], 'wp_listings_metabox_save' ) ) {
+			return $post_id;
+		}
 
-	    /** Don't try to save the data under autosave, ajax, or future post */
-	    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) return;
-	    if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) return;
-	    if ( defined( 'DOING_CRON' ) && DOING_CRON ) return;
+		/** Don't try to save the data under autosave, ajax, or future post */
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+		}
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			return;
+		}
+		if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+			return;
+		}
 
-	    /** Check permissions */
-	    if ( ! current_user_can( 'edit_post', $post_id ) )
-	        return;
+		/** Check permissions */
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			return;
+		}
 
-	    $property_details = $_POST['wp_listings'];
+		$property_details = $_POST['wp_listings'];
 
-	    if ( ! isset( $property_details['_listing_hide_price'] ) )
+		if ( ! isset( $property_details['_listing_hide_price'] ) ) {
 				$property_details['_listing_hide_price'] = 0;
+		}
 
-	    /** Store the property details custom fields */
-	    foreach ( (array) $property_details as $key => $value ) {
-
-	        /** Save/Update/Delete */
-	        if ( $value ) {
-	            update_post_meta($post->ID, $key, $value);
-	        } else {
-	            delete_post_meta($post->ID, $key);
-	        }
+		/** Store the property details custom fields */
+		foreach ( (array) $property_details as $key => $value ) {
 
-	    }
+			/** Save/Update/Delete */
+			if ( $value ) {
+				update_post_meta( $post->ID, $key, $value );
+			} else {
+				delete_post_meta( $post->ID, $key );
+			}
+		}
 
 	}
 
 	/**
 	 * Filter the columns in the "Listings" screen, define our own.
 	 */
-	function columns_filter ( $columns ) {
+	function columns_filter( $columns ) {
 
 		$columns = array(
-			'cb'					=> '<input type="checkbox" />',
-			'listing_thumbnail'		=> __( 'Thumbnail', 'wp-listings' ),
-			'title'					=> __( 'Listing Title', 'wp-listings' ),
-			'listing_details'		=> __( 'Details', 'wp-listings' ),
-			'listing_tags'			=> __( 'Tags', 'wp-listings' )
+			'cb'                => '<input type="checkbox" />',
+			'listing_thumbnail' => __( 'Thumbnail', 'wp-listings' ),
+			'title'             => __( 'Listing Title', 'wp-listings' ),
+			'listing_details'   => __( 'Details', 'wp-listings' ),
+			'listing_tags'      => __( 'Tags', 'wp-listings' ),
 		);
 
 		return $columns;
@@ -268,29 +287,29 @@ function columns_data( $column ) {
 
 		$image_size = 'style="max-width: 115px;"';
 
-		apply_filters( 'wp_listings_admin_listing_details', $admin_details = $this->property_details['col1']);
+		apply_filters( 'wp_listings_admin_listing_details', $admin_details = $this->property_details['col1'] );
 
-		if (isset($_GET["mode"]) && trim($_GET["mode"]) == 'excerpt' ) {
-			apply_filters( 'wp_listings_admin_extended_details', $admin_details = $this->property_details['col1'] + $this->property_details['col2']);
+		if ( isset( $_GET['mode'] ) && trim( $_GET['mode'] ) == 'excerpt' ) {
+			apply_filters( 'wp_listings_admin_extended_details', $admin_details = $this->property_details['col1'] + $this->property_details['col2'] );
 			$image_size = 'style="max-width: 150px;"';
 		}
 
-		$image = wp_get_attachment_image_src(get_post_thumbnail_id(), 'thumbnail');
+		$image = wp_get_attachment_image_src( get_post_thumbnail_id(), 'thumbnail' );
 
-		switch( $column ) {
-			case "listing_thumbnail":
+		switch ( $column ) {
+			case 'listing_thumbnail':
 				echo '<p><img src="' . $image[0] . '" alt="listing-thumbnail" ' . $image_size . '/></p>';
 				break;
-			case "listing_details":
+			case 'listing_details':
 				foreach ( (array) $admin_details as $label => $key ) {
-					printf( '<b>%s</b> %s<br />', esc_html( $label ), esc_html( get_post_meta($post->ID, $key, true) ) );
+					printf( '<b>%s</b> %s<br />', esc_html( $label ), esc_html( get_post_meta( $post->ID, $key, true ) ) );
 				}
 				break;
-			case "listing_tags":
-				_e('<b>Status</b>: ' . get_the_term_list( $post->ID, 'status', '', ', ', '' ) . '<br />', 'wp-listings');
-				_e('<b>Property Type:</b> ' . get_the_term_list( $post->ID, 'property-types', '', ', ', '' ) . '<br />', 'wp-listings');
-				_e('<b>Location:</b> ' . get_the_term_list( $post->ID, 'locations', '', ', ', '' ) . '<br />', 'wp-listings');
-				_e('<b>Features:</b> ' . get_the_term_list( $post->ID, 'features', '', ', ', '' ), 'wp-listings');
+			case 'listing_tags':
+				_e( '<b>Status</b>: ' . get_the_term_list( $post->ID, 'status', '', ', ', '' ) . '<br />', 'wp-listings' );
+				_e( '<b>Property Type:</b> ' . get_the_term_list( $post->ID, 'property-types', '', ', ', '' ) . '<br />', 'wp-listings' );
+				_e( '<b>Location:</b> ' . get_the_term_list( $post->ID, 'locations', '', ', ', '' ) . '<br />', 'wp-listings' );
+				_e( '<b>Features:</b> ' . get_the_term_list( $post->ID, 'features', '', ', ', '' ), 'wp-listings' );
 				break;
 		}
 
@@ -298,14 +317,16 @@ function columns_data( $column ) {
 
 	/**
 	 * Adds query var on saving post to show notice
+	 *
 	 * @param  [type] $post_id [description]
 	 * @param  [type] $post    [description]
 	 * @param  [type] $update  [description]
 	 * @return [type]          [description]
 	 */
 	function save_post( $post_id, $post, $update ) {
-		if ( 'listing' != $post->post_type )
+		if ( 'listing' != $post->post_type ) {
 			return;
+		}
 
 		add_filter( 'redirect_post_location', array( &$this, 'add_notice_query_var' ), 99 );
 	}
@@ -317,6 +338,7 @@ function add_notice_query_var( $location ) {
 
 	/**
 	 * Displays admin notices if show-notice url param exists or edit listing page
+	 *
 	 * @return object current screen
 	 * @uses  wp_listings_admin_notice
 	 */
@@ -324,14 +346,14 @@ function admin_notices() {
 
 		$screen = get_current_screen();
 
-		if ( isset( $_GET['wp-listings']) || $screen->id == 'edit-listing' ) {
-			if ( !class_exists( 'Idx_Broker_Plugin') ) {
-				echo wp_listings_admin_notice( __( '<strong>Integrate your MLS Listings into WordPress with IDX Broker!</strong> <a href="http://www.idxbroker.com/features/idx-wordpress-plugin">Find out how</a>', 'wp-listings' ), false, 'activate_plugins', (isset( $_GET['wp-listings'])) ? 'wpl_listing_notice_idx' : 'wpl_notice_idx' );
+		if ( isset( $_GET['wp-listings'] ) || $screen->id == 'edit-listing' ) {
+			if ( ! class_exists( 'Idx_Broker_Plugin' ) ) {
+				echo wp_listings_admin_notice( __( '<strong>Integrate your MLS Listings into WordPress with IDX Broker!</strong> <a href="http://www.idxbroker.com/features/idx-wordpress-plugin">Find out how</a>', 'wp-listings' ), false, 'activate_plugins', ( isset( $_GET['wp-listings'] ) ) ? 'wpl_listing_notice_idx' : 'wpl_notice_idx' );
 			}
-			if( !function_exists( 'equity' ) ) {
-				echo wp_listings_admin_notice( __( '<strong>Stop filling out forms. Equity automatically enhances your listings with extended property details.</strong> <a href="http://www.agentevolution.com/equity/">Find out how</a>', 'wp-listings' ), false, 'activate_plugins', (isset( $_GET['wp-listings'])) ? 'wpl_listing_notice_equity' : 'wpl_notice_equity' );
+			if ( ! function_exists( 'equity' ) ) {
+				echo wp_listings_admin_notice( __( '<strong>Stop filling out forms. Equity automatically enhances your listings with extended property details.</strong> <a href="http://www.agentevolution.com/equity/">Find out how</a>', 'wp-listings' ), false, 'activate_plugins', ( isset( $_GET['wp-listings'] ) ) ? 'wpl_listing_notice_equity' : 'wpl_notice_equity' );
 			}
-			if( get_option('wp_listings_import_progress') == true ) {
+			if ( get_option( 'wp_listings_import_progress' ) == true ) {
 				echo wp_listings_admin_notice( __( '<strong>Your listings are being imported in the background. This notice will dismiss when all selected listings have been imported.</strong>', 'wp-listings' ), false, 'activate_plugins', 'wpl_notice_import_progress' );
 			}
 		}
diff --git a/includes/class-taxonomies.php b/includes/class-taxonomies.php
index 17b8708..6a902f1 100755
--- a/includes/class-taxonomies.php
+++ b/includes/class-taxonomies.php
@@ -6,13 +6,12 @@
 /**
  * This class handles all the aspects of displaying, creating, and editing the
  * user-created taxonomies for the "Listings" post-type.
- *
  */
 class WP_Listings_Taxonomies {
 
 	var $settings_field = 'wp_listings_taxonomies';
-	var $menu_page = 'register-taxonomies';
-	var $reorder_page = 'reorder-taxonomies';
+	var $menu_page      = 'register-taxonomies';
+	var $reorder_page   = 'reorder-taxonomies';
 
 	/**
 	 * Construct Method.
@@ -31,19 +30,19 @@ function __construct() {
 
 		if ( function_exists( 'get_term_meta' ) ) {
 			add_action( 'init', array( $this, 'register_term_meta' ), 17 );
-			
-			foreach( (array) $this->get_taxonomies() as $slug => $data ) {
-				add_action( "{$slug}_add_form_fields", array( $this, 'wp_listings_new_term_image_field') );
-				add_action( "{$slug}_edit_form_fields", array( $this, 'wp_listings_edit_term_image_field') );
-				add_action( "create_{$slug}", array( $this, 'wp_listings_save_term_image') );
-				add_action( "edit_{$slug}", array( $this, 'wp_listings_save_term_image') );
+
+			foreach ( (array) $this->get_taxonomies() as $slug => $data ) {
+				add_action( "{$slug}_add_form_fields", array( $this, 'wp_listings_new_term_image_field' ) );
+				add_action( "{$slug}_edit_form_fields", array( $this, 'wp_listings_edit_term_image_field' ) );
+				add_action( "create_{$slug}", array( $this, 'wp_listings_save_term_image' ) );
+				add_action( "edit_{$slug}", array( $this, 'wp_listings_save_term_image' ) );
 				add_filter( "manage_edit-{$slug}_columns", array( $this, 'wp_listings_edit_term_columns' ) );
 				add_action( "manage_{$slug}_custom_column", array( $this, 'wp_listings_manage_term_custom_column' ), 10, 3 );
 			}
 		}
 
-		add_action('restrict_manage_posts', array($this, 'wp_listings_filter_post_type_by_taxonomy') );
-		add_filter('parse_query', array($this, 'wp_listings_convert_id_to_term_in_query') );
+		add_action( 'restrict_manage_posts', array( $this, 'wp_listings_filter_post_type_by_taxonomy' ) );
+		add_filter( 'parse_query', array( $this, 'wp_listings_convert_id_to_term_in_query' ) );
 
 	}
 
@@ -85,19 +84,18 @@ function actions() {
 	}
 
 	function tax_reorder_enqueue() {
-		wp_enqueue_script('jquery-ui-sortable');
+		wp_enqueue_script( 'jquery-ui-sortable' );
 	}
 
 	function admin() {
 
 		echo '<div class="wrap">';
 
-			if ( isset( $_REQUEST['view'] ) && 'edit' == $_REQUEST['view'] ) {
-				require( dirname( __FILE__ ) . '/views/edit-tax.php' );
-			}
-			else {
-				require( dirname( __FILE__ ) . '/views/create-tax.php' );
-			}
+		if ( isset( $_REQUEST['view'] ) && 'edit' == $_REQUEST['view'] ) {
+			require dirname( __FILE__ ) . '/views/edit-tax.php';
+		} else {
+			require dirname( __FILE__ ) . '/views/create-tax.php';
+		}
 
 		echo '</div>';
 
@@ -105,39 +103,45 @@ function admin() {
 
 	function create_taxonomy( $args = array() ) {
 
-		/**** VERIFY THE NONCE ****/
+		/**** VERIFY THE NONCE */
 
 		/** No empty fields */
-		if ( ! isset( $args['id'] ) || empty( $args['id'] ) )
+		if ( ! isset( $args['id'] ) || empty( $args['id'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
-		if ( ! isset( $args['name'] ) || empty( $args['name'] ) )
+		}
+		if ( ! isset( $args['name'] ) || empty( $args['name'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
-		if ( ! isset( $args['singular_name'] ) || empty( $args['singular_name'] ) )
+		}
+		if ( ! isset( $args['singular_name'] ) || empty( $args['singular_name'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
+		}
 
 		extract( $args );
 
 		$labels = array(
-			'name'					=> strip_tags( $name ),
-			'singular_name' 		=> strip_tags( $singular_name ),
-			'menu_name'				=> strip_tags( $name ),
-
-			'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-			'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-			'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-			'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-			'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+			'name'                  => strip_tags( $name ),
+			'singular_name'         => strip_tags( $singular_name ),
+			'menu_name'             => strip_tags( $name ),
+
+			'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+			'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+			'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+			'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+			'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 		);
 
 		$args = array(
-			'labels'		=> $labels,
-			'hierarchical'	=> true,
-			'rewrite'		=> array( 'slug' => $id, 'with_front' => false ),
-			'editable'		=> 1
+			'labels'       => $labels,
+			'hierarchical' => true,
+			'rewrite'      => array(
+				'slug'       => $id,
+				'with_front' => false,
+			),
+			'editable'     => 1,
 		);
 
 		$tax = array( $id => $args );
@@ -155,17 +159,18 @@ function create_taxonomy( $args = array() ) {
 
 	function delete_taxonomy( $id = '' ) {
 
-		/**** VERIFY THE NONCE ****/
+		/**** VERIFY THE NONCE */
 
 		/** No empty ID */
-		if ( ! isset( $id ) || empty( $id ) )
+		if ( ! isset( $id ) || empty( $id ) ) {
 			wp_die( __( "Nice try, partner. But that taxonomy doesn't exist. Click back and try again.", 'wp-listings' ) );
+		}
 
 		$options = get_option( $this->settings_field );
 
 		/** Look for the ID, delete if it exists */
 		if ( array_key_exists( $id, (array) $options ) ) {
-			unset( $options[$id] );
+			unset( $options[ $id ] );
 		} else {
 			wp_die( __( "Nice try, partner. But that taxonomy doesn't exist. Click back and try again.", 'wp-listings' ) );
 		}
@@ -177,39 +182,45 @@ function delete_taxonomy( $id = '' ) {
 
 	function edit_taxonomy( $args = array() ) {
 
-		/**** VERIFY THE NONCE ****/
+		/**** VERIFY THE NONCE */
 
 		/** No empty fields */
-		if ( ! isset( $args['id'] ) || empty( $args['id'] ) )
+		if ( ! isset( $args['id'] ) || empty( $args['id'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
-		if ( ! isset( $args['name'] ) || empty( $args['name'] ) )
+		}
+		if ( ! isset( $args['name'] ) || empty( $args['name'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
-		if ( ! isset( $args['singular_name'] ) || empty( $args['singular_name'] ) )
+		}
+		if ( ! isset( $args['singular_name'] ) || empty( $args['singular_name'] ) ) {
 			wp_die( __( 'Please complete all required fields.', 'wp-listings' ) );
+		}
 
 		extract( $args );
 
 		$labels = array(
-			'name'					=> strip_tags( $name ),
-			'singular_name' 		=> strip_tags( $singular_name ),
-			'menu_name'				=> strip_tags( $name ),
-
-			'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-			'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-			'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-			'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-			'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-			'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+			'name'                  => strip_tags( $name ),
+			'singular_name'         => strip_tags( $singular_name ),
+			'menu_name'             => strip_tags( $name ),
+
+			'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+			'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+			'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+			'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+			'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+			'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 		);
 
 		$args = array(
-			'labels'		=> $labels,
-			'hierarchical'	=> true,
-			'rewrite'		=> array( 'slug' => $id, 'with_front' => false ),
-			'editable'		=> 1
+			'labels'       => $labels,
+			'hierarchical' => true,
+			'rewrite'      => array(
+				'slug'       => $id,
+				'with_front' => false,
+			),
+			'editable'     => 1,
 		);
 
 		$tax = array( $id => $args );
@@ -229,17 +240,17 @@ function notices() {
 		$format = '<div id="message" class="updated"><p><strong>%s</strong></p></div>';
 
 		if ( isset( $_REQUEST['created'] ) && 'true' == $_REQUEST['created'] ) {
-			printf( $format, __('New taxonomy successfully created!', 'wp-listings') );
+			printf( $format, __( 'New taxonomy successfully created!', 'wp-listings' ) );
 			return;
 		}
 
 		if ( isset( $_REQUEST['edited'] ) && 'true' == $_REQUEST['edited'] ) {
-			printf( $format, __('Taxonomy successfully edited!', 'wp-listings') );
+			printf( $format, __( 'Taxonomy successfully edited!', 'wp-listings' ) );
 			return;
 		}
 
 		if ( isset( $_REQUEST['deleted'] ) && 'true' == $_REQUEST['deleted'] ) {
-			printf( $format, __('Taxonomy successfully deleted.', 'wp-listings') );
+			printf( $format, __( 'Taxonomy successfully deleted.', 'wp-listings' ) );
 			return;
 		}
 
@@ -252,33 +263,36 @@ function notices() {
 	 */
 	function listing_status_taxonomy() {
 
-		$name = __( 'Status', 'wp-listings' );
+		$name          = __( 'Status', 'wp-listings' );
 		$singular_name = __( 'Status', 'wp-listings' );
 
 		return array(
 			'status' => array(
-				'labels' => array(
-					'name'					=> strip_tags( $name ),
-					'singular_name' 		=> strip_tags( $singular_name ),
-					'menu_name'				=> strip_tags( $name ),
-
-					'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-					'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-					'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-					'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-					'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+				'labels'                => array(
+					'name'                  => strip_tags( $name ),
+					'singular_name'         => strip_tags( $singular_name ),
+					'menu_name'             => strip_tags( $name ),
+
+					'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+					'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+					'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+					'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+					'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 				),
-				'hierarchical' => true,
-				'rewrite'  => array( __( 'status', 'wp-listings' ), 'with_front' => false ),
-				'editable' => 0,
-				'show_in_rest'  => true,
-				'rest_base'     => 'listing-status',
-				'rest_controller_class' => 'WP_REST_Terms_Controller'
-			)
+				'hierarchical'          => true,
+				'rewrite'               => array(
+					__( 'status', 'wp-listings' ),
+					'with_front' => false,
+				),
+				'editable'              => 0,
+				'show_in_rest'          => true,
+				'rest_base'             => 'listing-status',
+				'rest_controller_class' => 'WP_REST_Terms_Controller',
+			),
 		);
 
 	}
@@ -288,33 +302,36 @@ function listing_status_taxonomy() {
 	 */
 	function property_type_taxonomy() {
 
-		$name = __( 'Property Types', 'wp-listings' );
+		$name          = __( 'Property Types', 'wp-listings' );
 		$singular_name = __( 'Property Type', 'wp-listings' );
 
 		return array(
 			'property-types' => array(
-				'labels' => array(
-					'name'					=> strip_tags( $name ),
-					'singular_name' 		=> strip_tags( $singular_name ),
-					'menu_name'				=> strip_tags( $name ),
-
-					'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-					'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-					'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-					'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-					'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+				'labels'                => array(
+					'name'                  => strip_tags( $name ),
+					'singular_name'         => strip_tags( $singular_name ),
+					'menu_name'             => strip_tags( $name ),
+
+					'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+					'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+					'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+					'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+					'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 				),
-				'hierarchical' => true,
-				'rewrite'  => array( __( 'property-types', 'wp-listings' ), 'with_front' => false ),
-				'editable' => 0,
-				'show_in_rest'  => true,
-				'rest_base'     => 'property-types',
-				'rest_controller_class' => 'WP_REST_Terms_Controller'
-			)
+				'hierarchical'          => true,
+				'rewrite'               => array(
+					__( 'property-types', 'wp-listings' ),
+					'with_front' => false,
+				),
+				'editable'              => 0,
+				'show_in_rest'          => true,
+				'rest_base'             => 'property-types',
+				'rest_controller_class' => 'WP_REST_Terms_Controller',
+			),
 		);
 
 	}
@@ -324,33 +341,36 @@ function property_type_taxonomy() {
 	 */
 	function listing_location_taxonomy() {
 
-		$name = __( 'Locations', 'wp-listings' );
+		$name          = __( 'Locations', 'wp-listings' );
 		$singular_name = __( 'Location', 'wp-listings' );
 
 		return array(
 			'locations' => array(
-				'labels' => array(
-					'name'					=> strip_tags( $name ),
-					'singular_name' 		=> strip_tags( $singular_name ),
-					'menu_name'				=> strip_tags( $name ),
-
-					'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-					'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-					'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-					'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-					'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+				'labels'                => array(
+					'name'                  => strip_tags( $name ),
+					'singular_name'         => strip_tags( $singular_name ),
+					'menu_name'             => strip_tags( $name ),
+
+					'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+					'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+					'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+					'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+					'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 				),
-				'hierarchical' => true,
-				'rewrite' => array( __( 'locations', 'wp-listings' ), 'with_front' => false ),
-				'editable' => 0,
-				'show_in_rest'  => true,
-				'rest_base'     => 'locations',
-				'rest_controller_class' => 'WP_REST_Terms_Controller'
-			)
+				'hierarchical'          => true,
+				'rewrite'               => array(
+					__( 'locations', 'wp-listings' ),
+					'with_front' => false,
+				),
+				'editable'              => 0,
+				'show_in_rest'          => true,
+				'rest_base'             => 'locations',
+				'rest_controller_class' => 'WP_REST_Terms_Controller',
+			),
 		);
 
 	}
@@ -360,33 +380,36 @@ function listing_location_taxonomy() {
 	 */
 	function property_features_taxonomy() {
 
-		$name = __( 'Features', 'wp-listings' );
+		$name          = __( 'Features', 'wp-listings' );
 		$singular_name = __( 'Feature', 'wp-listings' );
 
 		return array(
 			'features' => array(
-				'labels' => array(
-					'name'					=> strip_tags( $name ),
-					'singular_name' 		=> strip_tags( $singular_name ),
-					'menu_name'				=> strip_tags( $name ),
-
-					'search_items'			=> sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
-					'popular_items'			=> sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
-					'all_items'				=> sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
-					'edit_item'				=> sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'update_item'			=> sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_new_item'			=> sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'new_item_name'			=> sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
-					'add_or_remove_items'	=> sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
-					'choose_from_most_used'	=> sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) )
+				'labels'                => array(
+					'name'                  => strip_tags( $name ),
+					'singular_name'         => strip_tags( $singular_name ),
+					'menu_name'             => strip_tags( $name ),
+
+					'search_items'          => sprintf( __( 'Search %s', 'wp-listings' ), strip_tags( $name ) ),
+					'popular_items'         => sprintf( __( 'Popular %s', 'wp-listings' ), strip_tags( $name ) ),
+					'all_items'             => sprintf( __( 'All %s', 'wp-listings' ), strip_tags( $name ) ),
+					'edit_item'             => sprintf( __( 'Edit %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'update_item'           => sprintf( __( 'Update %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_new_item'          => sprintf( __( 'Add New %s', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'new_item_name'         => sprintf( __( 'New %s Name', 'wp-listings' ), strip_tags( $singular_name ) ),
+					'add_or_remove_items'   => sprintf( __( 'Add or Remove %s', 'wp-listings' ), strip_tags( $name ) ),
+					'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'wp-listings' ), strip_tags( $name ) ),
 				),
-				'hierarchical' => 0,
-				'rewrite' => array( __( 'features', 'wp-listings' ),  'with_front' => false ),
-				'editable' => 0,
-				'show_in_rest'  => true,
-				'rest_base'     => 'features',
-				'rest_controller_class' => 'WP_REST_Terms_Controller'
-			)
+				'hierarchical'          => 0,
+				'rewrite'               => array(
+					__( 'features', 'wp-listings' ),
+					'with_front' => false,
+				),
+				'editable'              => 0,
+				'show_in_rest'          => true,
+				'rest_base'             => 'features',
+				'rest_controller_class' => 'WP_REST_Terms_Controller',
+			),
 		);
 
 	}
@@ -396,7 +419,7 @@ function property_features_taxonomy() {
 	 */
 	function register_taxonomies() {
 
-		foreach( (array) $this->get_taxonomies() as $id => $data ) {
+		foreach ( (array) $this->get_taxonomies() as $id => $data ) {
 			register_taxonomy( $id, array( 'listing' ), $data );
 		}
 
@@ -413,33 +436,54 @@ function get_taxonomies() {
 
 	/**
 	 * Create the default terms
+	 *
 	 * @uses  wp_listings_default_status_terms filter to add or remove default taxonomy terms
 	 * @uses  wp_listings_default_property_type_terms filter to add or remove default taxonomy terms
 	 */
 	function create_terms() {
 
 		/** Default terms for status */
-		$status_terms = apply_filters( 'wp_listings_default_status_terms', array('Active' => 'active', 'Pending' => 'pending', 'For Rent' => 'for-rent', 'Sold' => 'sold', 'Featured' => 'featured', 'New' => 'new', 'Reduced' => 'reduced') );
-		foreach ($status_terms as $term => $slug) {
-			if (term_exists($term, 'status')) {
+		$status_terms = apply_filters(
+			'wp_listings_default_status_terms',
+			array(
+				'Active'   => 'active',
+				'Pending'  => 'pending',
+				'For Rent' => 'for-rent',
+				'Sold'     => 'sold',
+				'Featured' => 'featured',
+				'New'      => 'new',
+				'Reduced'  => 'reduced',
+			)
+		);
+		foreach ( $status_terms as $term => $slug ) {
+			if ( term_exists( $term, 'status' ) ) {
 				continue;
 			}
-			wp_insert_term($term,'status',array('slug' => $slug));
+			wp_insert_term( $term, 'status', array( 'slug' => $slug ) );
 		}
 
 		/** Default terms for property-type */
-		$property_type_terms = apply_filters( 'wp_listings_default_property_type_terms', array('Residential' => 'residential', 'Condo' => 'condo', 'Townhome' => 'townhome', 'Commercial' => 'commercial' ) );
-		foreach ($property_type_terms as $term => $slug) {
-			if (term_exists($term, 'property-types')) {
+		$property_type_terms = apply_filters(
+			'wp_listings_default_property_type_terms',
+			array(
+				'Residential' => 'residential',
+				'Condo'       => 'condo',
+				'Townhome'    => 'townhome',
+				'Commercial'  => 'commercial',
+			)
+		);
+		foreach ( $property_type_terms as $term => $slug ) {
+			if ( term_exists( $term, 'property-types' ) ) {
 				continue;
 			}
-			wp_insert_term($term,'property-types', array('slug' => $slug));
+			wp_insert_term( $term, 'property-types', array( 'slug' => $slug ) );
 		}
 
 	}
 
 	/**
 	 * Register term meta for a featured image
+	 *
 	 * @return [type] [description]
 	 */
 	function register_term_meta() {
@@ -448,6 +492,7 @@ function register_term_meta() {
 
 	/**
 	 * Callback to retrieve the term image
+	 *
 	 * @return [type] [description]
 	 */
 	function wp_listings_sanitize_term_image( $wpl_term_image ) {
@@ -456,6 +501,7 @@ function wp_listings_sanitize_term_image( $wpl_term_image ) {
 
 	/**
 	 * Get the term featured image id
+	 *
 	 * @param  $html bool whether to use html wrapper
 	 * @uses  wp_get_attachment_image to return image id wrapped in markup
 	 */
@@ -466,35 +512,38 @@ function wp_listings_get_term_image( $term_id, $html = true ) {
 
 	/**
 	 * Save the image uploaded
+	 *
 	 * @param  string $term_id term slug
 	 */
 	function wp_listings_save_term_image( $term_id ) {
 
-	    if ( ! isset( $_POST['wpl_term_image_nonce'] ) || ! wp_verify_nonce( $_POST['wpl_term_image_nonce'], basename( __FILE__ ) ) )
-	        return;
+		if ( ! isset( $_POST['wpl_term_image_nonce'] ) || ! wp_verify_nonce( $_POST['wpl_term_image_nonce'], basename( __FILE__ ) ) ) {
+			return;
+		}
 
-	    $old_image = $this->wp_listings_get_term_image( $term_id );
-	    $new_image = isset( $_POST['wpl-term-image'] ) ? $_POST['wpl-term-image'] : '';
+		$old_image = $this->wp_listings_get_term_image( $term_id );
+		$new_image = isset( $_POST['wpl-term-image'] ) ? $_POST['wpl-term-image'] : '';
 
-	    if ( $old_image && '' === $new_image )
-	        delete_term_meta( $term_id, 'wpl_term_image' );
+		if ( $old_image && '' === $new_image ) {
+			delete_term_meta( $term_id, 'wpl_term_image' );
 
-	    else if ( $old_image !== $new_image )
-	        update_term_meta( $term_id, 'wpl_term_image', $new_image );
+		} elseif ( $old_image !== $new_image ) {
+			update_term_meta( $term_id, 'wpl_term_image', $new_image );
+		}
 
-	    return $term_id;
+		return $term_id;
 
 	}
 
 	/**
 	 * Filter the edit term columns
 	 */
-	
+
 	function wp_listings_edit_term_columns( $columns ) {
 
-	    $columns['wpl_term_image'] = __( 'Image', 'wp-listings' );
+		$columns['wpl_term_image'] = __( 'Image', 'wp-listings' );
 
-	    return $columns;
+		return $columns;
 	}
 
 	/**
@@ -502,19 +551,20 @@ function wp_listings_edit_term_columns( $columns ) {
 	 */
 	function wp_listings_manage_term_custom_column( $out, $column, $term_id ) {
 
-	    if ( 'wpl_term_image' === $column ) {
+		if ( 'wpl_term_image' === $column ) {
 
-	        $image_id = $this->wp_listings_get_term_image( $term_id, false );
+			$image_id = $this->wp_listings_get_term_image( $term_id, false );
 
-	        if (!$image_id)
-	        	return $out;
+			if ( ! $image_id ) {
+				return $out;
+			}
 
-	        $image_markup = wp_get_attachment_image( $image_id, 'thumbnail', true, array('class' => 'wpl-term-image'));
+			$image_markup = wp_get_attachment_image( $image_id, 'thumbnail', true, array( 'class' => 'wpl-term-image' ) );
 
-	        $out = $image_markup;
-	    }
+			$out = $image_markup;
+		}
 
-	    return $out;
+		return $out;
 	}
 
 	/**
@@ -522,21 +572,23 @@ function wp_listings_manage_term_custom_column( $out, $column, $term_id ) {
 	 */
 	function wp_listings_filter_post_type_by_taxonomy() {
 		global $typenow;
-		$post_type = 'listing';
-		$taxonomies  = array('property-types', 'status', 'locations');
-		foreach($taxonomies as $taxonomy) {
-			if ($typenow == $post_type) {
-				$selected      = isset($_GET[$taxonomy]) ? $_GET[$taxonomy] : '';
-				$info_taxonomy = get_taxonomy($taxonomy);
-				wp_dropdown_categories(array(
-					'show_option_all' => __("Show All {$info_taxonomy->label}"),
-					'taxonomy'        => $taxonomy,
-					'name'            => $taxonomy,
-					'orderby'         => 'name',
-					'selected'        => $selected,
-					'show_count'      => true,
-					'hide_empty'      => true,
-				));
+		$post_type  = 'listing';
+		$taxonomies = array( 'property-types', 'status', 'locations' );
+		foreach ( $taxonomies as $taxonomy ) {
+			if ( $typenow == $post_type ) {
+				$selected      = isset( $_GET[ $taxonomy ] ) ? $_GET[ $taxonomy ] : '';
+				$info_taxonomy = get_taxonomy( $taxonomy );
+				wp_dropdown_categories(
+					array(
+						'show_option_all' => __( "Show All {$info_taxonomy->label}" ),
+						'taxonomy'        => $taxonomy,
+						'name'            => $taxonomy,
+						'orderby'         => 'name',
+						'selected'        => $selected,
+						'show_count'      => true,
+						'hide_empty'      => true,
+					)
+				);
 			};
 		}
 	}
@@ -544,15 +596,15 @@ function wp_listings_filter_post_type_by_taxonomy() {
 	/**
 	 * Filter posts by taxonomy in admin
 	 */
-	function wp_listings_convert_id_to_term_in_query($query) {
+	function wp_listings_convert_id_to_term_in_query( $query ) {
 		global $pagenow;
-		$post_type = 'listing';
-		$taxonomies  = array('property-types', 'status', 'locations');
-		$q_vars    = &$query->query_vars;
-		foreach($taxonomies as $taxonomy) {
-			if ( $pagenow == 'edit.php' && isset($q_vars['post_type']) && $q_vars['post_type'] == $post_type && isset($q_vars[$taxonomy]) && is_numeric($q_vars[$taxonomy]) && $q_vars[$taxonomy] != 0 ) {
-				$term = get_term_by('id', $q_vars[$taxonomy], $taxonomy);
-				$q_vars[$taxonomy] = $term->slug;
+		$post_type  = 'listing';
+		$taxonomies = array( 'property-types', 'status', 'locations' );
+		$q_vars     = &$query->query_vars;
+		foreach ( $taxonomies as $taxonomy ) {
+			if ( $pagenow == 'edit.php' && isset( $q_vars['post_type'] ) && $q_vars['post_type'] == $post_type && isset( $q_vars[ $taxonomy ] ) && is_numeric( $q_vars[ $taxonomy ] ) && $q_vars[ $taxonomy ] != 0 ) {
+				$term                = get_term_by( 'id', $q_vars[ $taxonomy ], $taxonomy );
+				$q_vars[ $taxonomy ] = $term->slug;
 			}
 		}
 	}
@@ -562,13 +614,13 @@ function wp_listings_convert_id_to_term_in_query($query) {
 	 */
 	function wp_listings_new_term_image_field( $term ) {
 
-	    $image_id = '';
+		$image_id = '';
 
-	    wp_nonce_field( basename( __FILE__ ), 'wpl_term_image_nonce' ); ?>
+		wp_nonce_field( basename( __FILE__ ), 'wpl_term_image_nonce' ); ?>
 
-	    <div class="form-field wpl-term-image-wrap">
-	        <label for="wpl-term-image"><?php _e( 'Image', 'wp-listings' ); ?></label>
-	        <!-- Begin term image -->
+		<div class="form-field wpl-term-image-wrap">
+			<label for="wpl-term-image"><?php _e( 'Image', 'wp-listings' ); ?></label>
+			<!-- Begin term image -->
 			<p>
 				<input type="hidden" name="wpl-term-image" id="wpl-term-image" value="<?php echo esc_attr( $image_id ); ?>" />
 				<a href="#" class="wpl-add-media wpl-add-media-img"><img class="wpl-term-image-url" src="" style="max-width: 100%; max-height: 200px; height: auto; display: block;" /></a>
@@ -576,25 +628,28 @@ function wp_listings_new_term_image_field( $term ) {
 				<a href="#" class="wpl-remove-media"><?php _e( 'Remove term image', 'wp-listings' ); ?></a>
 			</p>
 			<!-- End term image -->
-	    </div>
-	<?php }
+		</div>
+		<?php
+	}
 
 	/**
 	 * Field for editing an image on a term
 	 */
 	function wp_listings_edit_term_image_field( $term ) {
 
-	    $image_id = $this->wp_listings_get_term_image( $term->term_id, false );
-	    $image_url = wp_get_attachment_url($image_id);
+		$image_id  = $this->wp_listings_get_term_image( $term->term_id, false );
+		$image_url = wp_get_attachment_url( $image_id );
 
-	    if ( ! $image_url )
-	    	$image_url = ''; ?>
+		if ( ! $image_url ) {
+			$image_url = '';
+		}
+		?>
 
-	    <tr class="form-field wpl-term-image-wrap">
-	        <th scope="row"><label for="wpl-term-image"><?php _e( 'Image', 'wp-listings' ); ?></label></th>
-	        <td>
-	            <?php wp_nonce_field( basename( __FILE__ ), 'wpl_term_image_nonce' ); ?>
-	            <!-- Begin term image -->
+		<tr class="form-field wpl-term-image-wrap">
+			<th scope="row"><label for="wpl-term-image"><?php _e( 'Image', 'wp-listings' ); ?></label></th>
+			<td>
+				<?php wp_nonce_field( basename( __FILE__ ), 'wpl_term_image_nonce' ); ?>
+				<!-- Begin term image -->
 				<p>
 					<input type="hidden" name="wpl-term-image" id="wpl-term-image" value="<?php echo esc_attr( $image_id ); ?>" />
 					<a href="#" class="wpl-add-media wpl-add-media-img"><img class="wpl-term-image-url" src="<?php echo esc_url( $image_url ); ?>" style="max-width: 100%; max-height: 200px; height: auto; display: block;" /></a>
@@ -602,30 +657,33 @@ function wp_listings_edit_term_image_field( $term ) {
 					<a href="#" class="wpl-remove-media"><?php _e( 'Remove term image', 'wp-listings' ); ?></a>
 				</p>
 				<!-- End term image -->
-	        </td>
-	    </tr>
-	<?php }
+			</td>
+		</tr>
+		<?php
+	}
 
 	/**
 	 * Reorder taxonomies
 	 */
 	function tax_reorder() {
-		$wp_listings_taxes = get_option('wp_listings_taxonomies');
+		$wp_listings_taxes = get_option( 'wp_listings_taxonomies' );
 
-		if($_POST) {
-			$new_order = $_POST['wp_listings_taxonomy'];
+		if ( $_POST ) {
+			$new_order                   = $_POST['wp_listings_taxonomy'];
 			$wp_listings_taxes_reordered = array();
-			foreach( $new_order as $tax ) {
-				if($wp_listings_taxes[$tax])
-					$wp_listings_taxes_reordered[$tax] = $wp_listings_taxes[$tax];
+			foreach ( $new_order as $tax ) {
+				if ( $wp_listings_taxes[ $tax ] ) {
+					$wp_listings_taxes_reordered[ $tax ] = $wp_listings_taxes[ $tax ];
+				}
 			}
 			$wp_listings_taxes = $wp_listings_taxes_reordered;
-			update_option('wp_listings_taxonomies', $wp_listings_taxes_reordered);
+			update_option( 'wp_listings_taxonomies', $wp_listings_taxes_reordered );
 
-		}?>
+		}
+		?>
 	<h2><?php _e( 'Reorder Taxonomies', 'wp-listings' ); ?></h2>
 	<div id="col-container">
-		<div class="updated"><?php _e('Note: This will only allow you to reorder user-created taxonomies. Default taxonomies cannot be reordered (Status, Locations, Property Types, Features).', 'wp-listings' ); ?> </div>
+		<div class="updated"><?php _e( 'Note: This will only allow you to reorder user-created taxonomies. Default taxonomies cannot be reordered (Status, Locations, Property Types, Features).', 'wp-listings' ); ?> </div>
 		<style>
 #sortable{list-style-type:none;margin:10px 0;padding:0}#sortable li .item{-moz-border-radius:6px 6px 6px 6px;border:1px solid #e6e6e6;font-weight:bold;height:auto;line-height:35px;overflow:hidden;padding-left:10px;position:relative;text-shadow:0 1px 0 white;width:auto;word-wrap:break-word;cursor:move;background:none repeat-x scroll left top #dfdfdf;-moz-box-shadow:2px 2px 3px #888;-webkit-box-shadow:2px 2px 3px #888;box-shadow:2px 2px 3px #888}#sortable li span{position:absolute;margin-left:-1.3em}.ui-state-highlight{background:#e6e6e6;border:1px #666 dashed}.wplistings-submit{padding:5px 10px}.wplistings-submit:hover{background:#eaf2fa;font-weight:bold}
 		</style>
@@ -637,24 +695,24 @@ function tax_reorder() {
 		</script>
 		<div id="col-left">
 		<div class="col-wrap">
-	    <p><?php _e('Drag and Drop to reorder', 'wp-listings'); ?></p>
+		<p><?php _e( 'Drag and Drop to reorder', 'wp-listings' ); ?></p>
 		<form method="post">
 		<ul id="sortable">
-	    	<?php foreach($wp_listings_taxes as $wp_listings_tax_key => $wp_listings_tax_value) { ?>
-	        	<li class="ui-state-default">
-	            	<div class="item">
+			<?php foreach ( $wp_listings_taxes as $wp_listings_tax_key => $wp_listings_tax_value ) { ?>
+				<li class="ui-state-default">
+					<div class="item">
 						<?php echo $wp_listings_tax_value['labels']['name']; ?><input type="hidden" id="wp_listings_taxonomy[]" name="wp_listings_taxonomy[]" value="<?php echo $wp_listings_tax_key; ?>" />
-	                </div>
-	            </li>
-	        <?php } ?>
+					</div>
+				</li>
+			<?php } ?>
 		</ul>
-	    <input class="wplistings-submit" type="submit" value="Save" />
+		<input class="wplistings-submit" type="submit" value="Save" />
 		</form>
 		</div>
 		</div><!-- /col-left -->
 
 	</div><!-- /col-container -->
-	<?php
+		<?php
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/functions.php b/includes/functions.php
index e3f2f29..dc64e15 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Holds miscellaneous functions for use in the WP Listings plugin
- *
  */
 add_image_size( 'listings-full', 1060, 9999, false );
 add_image_size( 'listings', 560, 380, true );
@@ -14,25 +13,25 @@ function wp_listings_template_include( $template ) {
 	$post_type = 'listing';
 
 	if ( $wp_query->is_search && get_post_type() == 'listing' ) {
-		if ( file_exists(get_stylesheet_directory() . '/search-' . $post_type . '.php') ) {
+		if ( file_exists( get_stylesheet_directory() . '/search-' . $post_type . '.php' ) ) {
 			$template = get_stylesheet_directory() . '/search-' . $post_type . '.php';
 			return $template;
 		} else {
 			return dirname( __FILE__ ) . '/views/archive-' . $post_type . '.php';
 		}
 	}
-    if ( wp_listings_is_taxonomy_of($post_type) ) {
-    	if ( file_exists(get_stylesheet_directory() . '/taxonomy-' . $post_type . '.php' ) ) {
-    	    return get_stylesheet_directory() . '/taxonomy-' . $post_type . '.php';
-    	} elseif ( file_exists(get_stylesheet_directory() . '/archive-' . $post_type . '.php' ) ) {
-        	return get_stylesheet_directory() . '/archive-' . $post_type . '.php';
-        } else {
-            return dirname( __FILE__ ) . '/views/archive-' . $post_type . '.php';
-        }
-    }
+	if ( wp_listings_is_taxonomy_of( $post_type ) ) {
+		if ( file_exists( get_stylesheet_directory() . '/taxonomy-' . $post_type . '.php' ) ) {
+			return get_stylesheet_directory() . '/taxonomy-' . $post_type . '.php';
+		} elseif ( file_exists( get_stylesheet_directory() . '/archive-' . $post_type . '.php' ) ) {
+			return get_stylesheet_directory() . '/archive-' . $post_type . '.php';
+		} else {
+			return dirname( __FILE__ ) . '/views/archive-' . $post_type . '.php';
+		}
+	}
 
 	if ( is_post_type_archive( $post_type ) ) {
-		if ( file_exists(get_stylesheet_directory() . '/archive-' . $post_type . '.php') ) {
+		if ( file_exists( get_stylesheet_directory() . '/archive-' . $post_type . '.php' ) ) {
 			$template = get_stylesheet_directory() . '/archive-' . $post_type . '.php';
 			return $template;
 		} else {
@@ -49,17 +48,17 @@ function wp_listings_template_include( $template ) {
 		/** Prevent directory traversal */
 		$custom_template = str_replace( '..', '', $custom_template );
 
-		if( ! $custom_template )
-			if( file_exists(get_stylesheet_directory() . '/single-' . $post_type . '.php') )
+		if ( ! $custom_template ) {
+			if ( file_exists( get_stylesheet_directory() . '/single-' . $post_type . '.php' ) ) {
 				return $template;
-			else
+			} else {
 				return dirname( __FILE__ ) . '/views/single-' . $post_type . '.php';
-		else
-			if( file_exists( get_stylesheet_directory() . "/{$custom_template}" ) )
+			}
+		} elseif ( file_exists( get_stylesheet_directory() . "/{$custom_template}" ) ) {
 				$template = get_stylesheet_directory() . "/{$custom_template}";
-			elseif( file_exists( get_template_directory() . "/{$custom_template}" ) )
-				$template = get_template_directory() . "/{$custom_template}";
-
+		} elseif ( file_exists( get_template_directory() . "/{$custom_template}" ) ) {
+			$template = get_template_directory() . "/{$custom_template}";
+		}
 	}
 
 	return $template;
@@ -68,23 +67,23 @@ function wp_listings_template_include( $template ) {
 /**
  * Controls output of default state for the state custom field if there is one set
  */
-function wp_listings_get_state($post_id = null) {
-	$options = get_option('plugin_wp_listings_settings');
+function wp_listings_get_state( $post_id = null ) {
+	$options = get_option( 'plugin_wp_listings_settings' );
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$state = get_post_meta($post_id, '_listing_state', true);
-	if (isset($options['wp_listings_default_state'])) {
+	$state = get_post_meta( $post_id, '_listing_state', true );
+	if ( isset( $options['wp_listings_default_state'] ) ) {
 		$default_state = $options['wp_listings_default_state'];
 	}
 
-	if ( empty($default_state) ) {
+	if ( empty( $default_state ) ) {
 		$default_state = 'ST';
 	}
 
-	if ( empty($state) ) {
+	if ( empty( $state ) ) {
 		return $default_state;
 	}
 
@@ -93,13 +92,13 @@ function wp_listings_get_state($post_id = null) {
 /**
  * Controls output of city name
  */
-function wp_listings_get_city($post_id = null) {
+function wp_listings_get_city( $post_id = null ) {
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$city = get_post_meta($post_id, '_listing_city', true);
+	$city = get_post_meta( $post_id, '_listing_city', true );
 	if ( '' == $city ) {
 		$city = 'Cityname';
 	}
@@ -109,13 +108,13 @@ function wp_listings_get_city($post_id = null) {
 /**
  * Controls output of address
  */
-function wp_listings_get_address($post_id = null) {
+function wp_listings_get_address( $post_id = null ) {
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$address = get_post_meta($post_id, '_listing_address', true);
+	$address = get_post_meta( $post_id, '_listing_address', true );
 	if ( '' == $address ) {
 		$address = 'Address Unavailable';
 	}
@@ -125,22 +124,22 @@ function wp_listings_get_address($post_id = null) {
 /**
  * Displays the status (active, pending, sold, for rent) of a listing
  */
-function wp_listings_get_status($post_id = null, $single = 0) {
+function wp_listings_get_status( $post_id = null, $single = 0 ) {
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$listing_status = wp_get_object_terms($post_id, 'status');
-	if ( empty($listing_status) || is_wp_error($listing_status) ) {
+	$listing_status = wp_get_object_terms( $post_id, 'status' );
+	if ( empty( $listing_status ) || is_wp_error( $listing_status ) ) {
 		return;
 	}
 
 	$status = null;
-	foreach($listing_status as $term) {
-		if ( $term->name != 'Featured') {
+	foreach ( $listing_status as $term ) {
+		if ( $term->name != 'Featured' ) {
 			$status .= $term->name;
-			if($single == 0) {
+			if ( $single == 0 ) {
 				return $status;
 			}
 			$status .= '<br />';
@@ -152,51 +151,51 @@ function wp_listings_get_status($post_id = null, $single = 0) {
 /**
  * Displays the property type (residential, condo, comemrcial, etc) of a listing
  */
-function wp_listings_get_property_types($post_id = null) {
+function wp_listings_get_property_types( $post_id = null ) {
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$listing_property_types = wp_get_object_terms($post_id, 'property-types');
-	if ( empty($listing_property_types) || is_wp_error($listing_property_types) ) {
+	$listing_property_types = wp_get_object_terms( $post_id, 'property-types' );
+	if ( empty( $listing_property_types ) || is_wp_error( $listing_property_types ) ) {
 		return;
 	}
 
-	foreach($listing_property_types as $type) {
+	foreach ( $listing_property_types as $type ) {
 		return $type->name;
 	}
 }
 /**
  * Displays the location term of a listing
  */
-function wp_listings_get_locations($post_id = null) {
+function wp_listings_get_locations( $post_id = null ) {
 	if ( null == $post_id ) {
 		global $post;
 		$post_id = $post->ID;
 	}
 
-	$listing_locations = wp_get_object_terms($post_id, 'locations');
-	if ( empty($listing_locations) || is_wp_error($listing_locations) ) {
+	$listing_locations = wp_get_object_terms( $post_id, 'locations' );
+	if ( empty( $listing_locations ) || is_wp_error( $listing_locations ) ) {
 		return;
 	}
 
-	foreach($listing_locations as $location) {
+	foreach ( $listing_locations as $location ) {
 		return $location->name;
 	}
 }
 
 function wp_listings_post_number( $query ) {
 
-	if ( !$query->is_main_query() || is_admin() || !is_post_type_archive('listing') ) {
+	if ( ! $query->is_main_query() || is_admin() || ! is_post_type_archive( 'listing' ) ) {
 		return;
 	}
 
-	$options = get_option('plugin_wp_listings_settings');
+	$options = get_option( 'plugin_wp_listings_settings' );
 
 	$archive_posts_num = $options['wp_listings_archive_posts_num'];
 
-	if ( empty($archive_posts_num) ) {
+	if ( empty( $archive_posts_num ) ) {
 		$archive_posts_num = '9';
 	}
 
@@ -211,44 +210,46 @@ function wp_listings_post_number( $query ) {
 add_filter( 'dashboard_glance_items', 'impress_listings_glance_items', 10, 1 );
 function impress_listings_glance_items( $items = array() ) {
 
-    $post_types = array( 'listing' );
+	$post_types = array( 'listing' );
 
-    foreach( $post_types as $type ) {
+	foreach ( $post_types as $type ) {
 
-        if( ! post_type_exists( $type ) ) continue;
+		if ( ! post_type_exists( $type ) ) {
+			continue;
+		}
 
-        $num_posts = wp_count_posts( $type );
+		$num_posts = wp_count_posts( $type );
 
-        if( $num_posts ) {
+		if ( $num_posts ) {
 
-            $published = intval( $num_posts->publish );
-            $post_type = get_post_type_object( $type );
+			$published = intval( $num_posts->publish );
+			$post_type = get_post_type_object( $type );
 
-            $text = _n( '%s ' . $post_type->labels->singular_name, '%s ' . $post_type->labels->name, $published, 'wp-listings' );
-            $text = sprintf( $text, number_format_i18n( $published ) );
+			$text = _n( '%s ' . $post_type->labels->singular_name, '%s ' . $post_type->labels->name, $published, 'wp-listings' );
+			$text = sprintf( $text, number_format_i18n( $published ) );
 
-            if ( current_user_can( $post_type->cap->edit_posts ) ) {
-                $items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text ) . "\n";
-            } else {
-                $items[] = sprintf( '<span class="%1$s-count">%2$s</span>', $type, $text ) . "\n";
-            }
-        }
-    }
+			if ( current_user_can( $post_type->cap->edit_posts ) ) {
+				$items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text ) . "\n";
+			} else {
+				$items[] = sprintf( '<span class="%1$s-count">%2$s</span>', $type, $text ) . "\n";
+			}
+		}
+	}
 
-    return $items;
+	return $items;
 }
 
 /**
  * Better Jetpack Related Posts Support for Listings
  */
 function wp_listings_jetpack_relatedposts( $headline ) {
-  if ( is_singular( 'listing' ) ) {
-    $headline = sprintf(
-        '<h3 class="jp-relatedposts-headline"><em>%s</em></h3>',
-        esc_html( 'Similar Listings' )
-        );
-  }
-  return $headline;
+	if ( is_singular( 'listing' ) ) {
+		$headline = sprintf(
+			'<h3 class="jp-relatedposts-headline"><em>%s</em></h3>',
+			esc_html( 'Similar Listings' )
+		);
+	}
+	return $headline;
 }
 add_filter( 'jetpack_relatedposts_filter_headline', 'wp_listings_jetpack_relatedposts' );
 
@@ -270,11 +271,12 @@ function wp_listings_jetpack_sitemap() {
 
 /**
  * Function to return term image for use on front end
- * @param  num  $term_id the id of the term
+ *
+ * @param  num     $term_id the id of the term
  * @param  boolean $html    use html wrapper with wp_get_attachment_image
  * @return mixed  the image with html markup or the image id
  */
 function wp_listings_term_image( $term_id, $html = true, $size = 'full' ) {
 	$image_id = get_term_meta( $term_id, 'wpl_term_image', true );
-	return $image_id && $html ? wp_get_attachment_image( $image_id, $size, false, array('class' => 'wp-listings-term-image') ) : $image_id;
+	return $image_id && $html ? wp_get_attachment_image( $image_id, $size, false, array( 'class' => 'wp-listings-term-image' ) ) : $image_id;
 }
diff --git a/includes/helpers.php b/includes/helpers.php
index 43655f2..dc77111 100755
--- a/includes/helpers.php
+++ b/includes/helpers.php
@@ -6,17 +6,18 @@
  * Adds the taxonomy title and a list of the terms associated with that taxonomy
  * used in custom post type templates.
  */
-function wp_listings_list_terms($taxonomy) {
-	$the_tax_object = get_taxonomy($taxonomy);
-	$terms = get_terms($taxonomy);
-	$term_list = '';
-
-	$count = count($terms); $i=0;
-	if ($count > 0) {
-	    foreach ($terms as $term) {
-	        $i++;
-	    	$term_list .= '<li><a href="' . site_url($taxonomy . '/' . $term->slug) . '" title="' . sprintf(__('View all post filed under %s', 'gbd'), $term->name) . '">' . $term->name . ' (' . $term->count . ')</a></li>';
-	    }
+function wp_listings_list_terms( $taxonomy ) {
+	$the_tax_object = get_taxonomy( $taxonomy );
+	$terms          = get_terms( $taxonomy );
+	$term_list      = '';
+
+	$count = count( $terms );
+	$i     = 0;
+	if ( $count > 0 ) {
+		foreach ( $terms as $term ) {
+			$i++;
+			$term_list .= '<li><a href="' . site_url( $taxonomy . '/' . $term->slug ) . '" title="' . sprintf( __( 'View all post filed under %s', 'gbd' ), $term->name ) . '">' . $term->name . ' (' . $term->count . ')</a></li>';
+		}
 		echo '<div class="' . $taxonomy . ' term-list-container">';
 		echo '<h3 class="taxonomy-name">' . $the_tax_object->label . '</h3>';
 		echo "<ul class=\"term-list\">{$term_list}</ul>";
@@ -28,11 +29,11 @@ function wp_listings_list_terms($taxonomy) {
 /**
  * Returns true if the queried taxonomy is a taxonomy of the given post type
  */
-function wp_listings_is_taxonomy_of($post_type) {
-	$taxonomies = get_object_taxonomies($post_type);
-	$queried_tax = get_query_var('taxonomy');
+function wp_listings_is_taxonomy_of( $post_type ) {
+	$taxonomies  = get_object_taxonomies( $post_type );
+	$queried_tax = get_query_var( 'taxonomy' );
 
-	if ( in_array($queried_tax, $taxonomies) ) {
+	if ( in_array( $queried_tax, $taxonomies ) ) {
 		return true;
 	}
 
@@ -98,27 +99,29 @@ function wp_listings_paging_nav() {
 	$format .= $GLOBALS['wp_rewrite']->using_permalinks() ? user_trailingslashit( 'page/%#%', 'paged' ) : '?paged=%#%';
 
 	// Set up paginated links.
-	$links = paginate_links( array(
-		'base'     => $pagenum_link,
-		'format'   => $format,
-		'total'    => $GLOBALS['wp_query']->max_num_pages,
-		'current'  => $paged,
-		'mid_size' => 1,
-		'add_args' => array_map( 'urlencode', $query_args ),
-		'prev_text' => __( '&larr; Previous', 'wp-listings' ),
-		'next_text' => __( 'Next &rarr;', 'wp-listings' ),
-	) );
+	$links = paginate_links(
+		array(
+			'base'      => $pagenum_link,
+			'format'    => $format,
+			'total'     => $GLOBALS['wp_query']->max_num_pages,
+			'current'   => $paged,
+			'mid_size'  => 1,
+			'add_args'  => array_map( 'urlencode', $query_args ),
+			'prev_text' => __( '&larr; Previous', 'wp-listings' ),
+			'next_text' => __( 'Next &rarr;', 'wp-listings' ),
+		)
+	);
 
 	if ( $links ) :
 
-	?>
+		?>
 	<nav class="navigation archive-listing-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Listings navigation', 'wp-listings' ); ?></h1>
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 		</div><!-- .pagination -->
 	</nav><!-- .navigation -->
-	<?php
+		<?php
 	endif;
 }
 
@@ -137,8 +140,9 @@ function wp_listings_get_additional_image_sizes() {
 
 	global $_wp_additional_image_sizes;
 
-	if ( $_wp_additional_image_sizes )
+	if ( $_wp_additional_image_sizes ) {
 		return $_wp_additional_image_sizes;
+	}
 
 	return array();
 
@@ -148,34 +152,34 @@ function wp_listings_get_additional_image_sizes() {
 /*
  * function to set column classes based on parameter
  */
-function get_column_class($columns) {
-    $column_class = '';
-
-    // Max of six columns
-    $columns = ( $columns > 6 ) ? 6 : (int)$columns;
-
-    // column class
-    switch ($columns) {
-        case 0:
-        case 1:
-            $column_class = '';
-            break;
-        case 2:
-            $column_class = 'one-half';
-            break;
-        case 3:
-            $column_class = 'one-third';
-            break;
-        case 4:
-            $column_class = 'one-fourth';
-            break;
-        case 5:
-            $column_class = 'one-fifth';
-            break;
-        case 6:
-            $column_class = 'one-sixth';
-            break;
-    }
-
-    return $column_class;
+function get_column_class( $columns ) {
+	$column_class = '';
+
+	// Max of six columns
+	$columns = ( $columns > 6 ) ? 6 : (int) $columns;
+
+	// column class
+	switch ( $columns ) {
+		case 0:
+		case 1:
+			$column_class = '';
+			break;
+		case 2:
+			$column_class = 'one-half';
+			break;
+		case 3:
+			$column_class = 'one-third';
+			break;
+		case 4:
+			$column_class = 'one-fourth';
+			break;
+		case 5:
+			$column_class = 'one-fifth';
+			break;
+		case 6:
+			$column_class = 'one-sixth';
+			break;
+	}
+
+	return $column_class;
 }
diff --git a/includes/recaptcha.php b/includes/recaptcha.php
index 397026c..5aabcff 100644
--- a/includes/recaptcha.php
+++ b/includes/recaptcha.php
@@ -1,38 +1,45 @@
 <?php
 
-/* An autoloader for ReCaptcha\Foo classes. This should be required()
+/*
+ An autoloader for ReCaptcha\Foo classes. This should be required()
  * by the user before attempting to instantiate any of the ReCaptcha
  * classes.
  */
 
-spl_autoload_register(function ($class) {
-	if (substr($class, 0, 10) !== 'ReCaptcha\\') {
-	  /* If the class does not lie under the "ReCaptcha" namespace,
-	   * then we can exit immediately.
-	   */
-	  return;
-	}
+spl_autoload_register(
+	function ( $class ) {
+		if ( substr( $class, 0, 10 ) !== 'ReCaptcha\\' ) {
+			/*
+			If the class does not lie under the "ReCaptcha" namespace,
+			* then we can exit immediately.
+			*/
+			return;
+		}
 
-	/* All of the classes have names like "ReCaptcha\Foo", so we need
-	 * to replace the backslashes with frontslashes if we want the
-	 * name to map directly to a location in the filesystem.
-	 */
-	$class = str_replace('\\', '/', $class);
+		/*
+		All of the classes have names like "ReCaptcha\Foo", so we need
+		* to replace the backslashes with frontslashes if we want the
+		* name to map directly to a location in the filesystem.
+		*/
+		$class = str_replace( '\\', '/', $class );
 
-	/* First, check under the current directory. It is important that
-	 * we look here first, so that we don't waste time searching for
-	 * test classes in the common case.
-	 */
-	$path = dirname(__FILE__).'/'.$class.'.php';
-	if (is_readable($path)) {
-		require_once $path;
-	}
+		/*
+		First, check under the current directory. It is important that
+		* we look here first, so that we don't waste time searching for
+		* test classes in the common case.
+		*/
+		$path = dirname( __FILE__ ) . '/' . $class . '.php';
+		if ( is_readable( $path ) ) {
+			require_once $path;
+		}
 
-	/* If we didn't find what we're looking for already, maybe it's
-	 * a test class?
-	 */
-	$path = dirname(__FILE__).'/../tests/'.$class.'.php';
-	if (is_readable($path)) {
-		require_once $path;
+		/*
+		If we didn't find what we're looking for already, maybe it's
+		* a test class?
+		*/
+		$path = dirname( __FILE__ ) . '/../tests/' . $class . '.php';
+		if ( is_readable( $path ) ) {
+			require_once $path;
+		}
 	}
-});
+);
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index 91b523a..8fd9b1e 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * Adds shortcode to display listings
  * Adds shortcode to display post meta
@@ -6,26 +6,31 @@
 
 add_shortcode( 'listings', 'wp_listings_shortcode' );
 
-function wp_listings_shortcode($atts, $content = null) {
-	extract(shortcode_atts(array(
-		'id'       => '',
-		'taxonomy' => '',
-		'term'     => '',
-		'limit'    => '',
-		'columns'  => ''
-	), $atts ) );
+function wp_listings_shortcode( $atts, $content = null ) {
+	extract(
+		shortcode_atts(
+			array(
+				'id'       => '',
+				'taxonomy' => '',
+				'term'     => '',
+				'limit'    => '',
+				'columns'  => '',
+			),
+			$atts
+		)
+	);
 
 	/**
 	 * if limit is empty set to all
 	 */
-	if(!$limit) {
+	if ( ! $limit ) {
 		$limit = -1;
 	}
 
 	/**
 	 * if columns is empty set to 0
 	 */
-	if(!$columns) {
+	if ( ! $columns ) {
 		$columns = 0;
 	}
 
@@ -33,28 +38,28 @@ function wp_listings_shortcode($atts, $content = null) {
 	 * query args based on parameters
 	 */
 	$query_args = array(
-		'post_type'       => 'listing',
-		'posts_per_page'  => $limit
+		'post_type'      => 'listing',
+		'posts_per_page' => $limit,
 	);
 
-	if($id) {
+	if ( $id ) {
 		$query_args = array(
-			'post_type'       => 'listing',
-			'post__in'        => explode(',', $id)
+			'post_type' => 'listing',
+			'post__in'  => explode( ',', $id ),
 		);
 	}
 
-	if($term && $taxonomy) {
+	if ( $term && $taxonomy ) {
 		$query_args = array(
-			'post_type'       => 'listing',
-			'posts_per_page'  => $limit,
-			'tax_query'       => array(
+			'post_type'      => 'listing',
+			'posts_per_page' => $limit,
+			'tax_query'      => array(
 				array(
 					'taxonomy' => $taxonomy,
 					'field'    => 'slug',
-					'terms'     => $term
-				)
-			)
+					'terms'    => $term,
+				),
+			),
 		);
 	}
 
@@ -69,16 +74,17 @@ function wp_listings_shortcode($atts, $content = null) {
 
 	$output = '<div class="wp-listings-shortcode">';
 
-	foreach ( $listings_array as $post ) : setup_postdata( $post );
+	foreach ( $listings_array as $post ) :
+		setup_postdata( $post );
 
 		$count = ( $count == $columns ) ? 1 : $count + 1;
 
 		$first_class = ( 1 == $count ) ? 'first' : '';
 
-		$output .= '<div class="listing-wrap ' . get_column_class($columns) . ' ' . $first_class . '"><div class="listing-widget-thumb"><a href="' . get_permalink() . '" class="listing-image-link">' . get_the_post_thumbnail( $post->ID, 'listings' ) . '</a>';
+		$output .= '<div class="listing-wrap ' . get_column_class( $columns ) . ' ' . $first_class . '"><div class="listing-widget-thumb"><a href="' . get_permalink() . '" class="listing-image-link">' . get_the_post_thumbnail( $post->ID, 'listings' ) . '</a>';
 
 		if ( '' != wp_listings_get_status() ) {
-			$output .= '<span class="listing-status ' . strtolower(str_replace(' ', '-', wp_listings_get_status())) . '">' . wp_listings_get_status() . '</span>';
+			$output .= '<span class="listing-status ' . strtolower( str_replace( ' ', '-', wp_listings_get_status() ) ) . '">' . wp_listings_get_status() . '</span>';
 		}
 
 		$output .= '<div class="listing-thumb-meta">';
@@ -96,15 +102,15 @@ function wp_listings_shortcode($atts, $content = null) {
 		$output .= '</div><!-- .listing-thumb-meta --></div><!-- .listing-widget-thumb -->';
 
 		if ( '' != get_post_meta( $post->ID, '_listing_open_house', true ) ) {
-			$output .= '<span class="listing-open-house">' . __( "Open House", 'wp-listings' ) . ': ' . get_post_meta( $post->ID, '_listing_open_house', true ) . '</span>';
+			$output .= '<span class="listing-open-house">' . __( 'Open House', 'wp-listings' ) . ': ' . get_post_meta( $post->ID, '_listing_open_house', true ) . '</span>';
 		}
 
 		$output .= '<div class="listing-widget-details"><h3 class="listing-title"><a href="' . get_permalink() . '">' . get_the_title() . '</a></h3>';
 		$output .= '<p class="listing-address"><span class="listing-address">' . wp_listings_get_address() . '</span><br />';
 		$output .= '<span class="listing-city-state-zip">' . wp_listings_get_city() . ', ' . wp_listings_get_state() . ' ' . get_post_meta( $post->ID, '_listing_zip', true ) . '</span></p>';
 
-		if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true )) {
-			$output .= '<ul class="listing-beds-baths-sqft"><li class="beds">' . get_post_meta( $post->ID, '_listing_bedrooms', true ) . '<span>' . __( "Beds", 'wp-listings' ) . '</span></li> <li class="baths">' . get_post_meta( $post->ID, '_listing_bathrooms', true ) . '<span>' . __( "Baths", 'wp-listings' ) . '</span></li> <li class="sqft">' . get_post_meta( $post->ID, '_listing_sqft', true ) . '<span>' . __( "Square Feet", 'wp-listings' ) . '</span></li></ul>';
+		if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true ) ) {
+			$output .= '<ul class="listing-beds-baths-sqft"><li class="beds">' . get_post_meta( $post->ID, '_listing_bedrooms', true ) . '<span>' . __( 'Beds', 'wp-listings' ) . '</span></li> <li class="baths">' . get_post_meta( $post->ID, '_listing_bathrooms', true ) . '<span>' . __( 'Baths', 'wp-listings' ) . '</span></li> <li class="sqft">' . get_post_meta( $post->ID, '_listing_sqft', true ) . '<span>' . __( 'Square Feet', 'wp-listings' ) . '</span></li></ul>';
 		}
 
 		$output .= '</div><!-- .listing-widget-details --></div><!-- .listing-wrap -->';
@@ -116,20 +122,26 @@ function wp_listings_shortcode($atts, $content = null) {
 	wp_reset_postdata();
 
 	return $output;
-	
+
 }
 
-add_shortcode('wp_listings_meta', 'wp_listings_meta_shortcode');
+add_shortcode( 'wp_listings_meta', 'wp_listings_meta_shortcode' );
 /**
  * Returns meta data for listings
+ *
  * @param  array $atts meta key
  * @return string meta value wrapped in span
  */
-function wp_listings_meta_shortcode($atts) {
-	extract(shortcode_atts(array(
-		'key' => ''
-	), $atts ) );
+function wp_listings_meta_shortcode( $atts ) {
+	extract(
+		shortcode_atts(
+			array(
+				'key' => '',
+			),
+			$atts
+		)
+	);
 	$postid = get_the_id();
 
-	return '<span class=' . $key . '>' . get_post_meta($postid, '_listing_' . $key, true) . '</span>';
+	return '<span class=' . $key . '>' . get_post_meta( $postid, '_listing_' . $key, true ) . '</span>';
 }
diff --git a/includes/views/agentevo-metabox.php b/includes/views/agentevo-metabox.php
index 799252a..c74c814 100755
--- a/includes/views/agentevo-metabox.php
+++ b/includes/views/agentevo-metabox.php
@@ -1,2 +1,2 @@
 <?php
-echo '<a href="http://www.agentevolution.com/equity" target="_blank"><img style="max-width: 100%;" src="' . WP_LISTINGS_URL . 'images/equity-ad.png" alt="Import your Listings with the Equity Framework"></a>';
\ No newline at end of file
+echo '<a href="http://www.agentevolution.com/equity" target="_blank"><img style="max-width: 100%;" src="' . WP_LISTINGS_URL . 'images/equity-ad.png" alt="Import your Listings with the Equity Framework"></a>';
diff --git a/includes/views/archive-listing.php b/includes/views/archive-listing.php
index b9f87d2..16745ee 100755
--- a/includes/views/archive-listing.php
+++ b/includes/views/archive-listing.php
@@ -16,69 +16,68 @@ function archive_listing_loop() {
 
 		// Uncomment to use term image in your theme
 		// echo '<div class="wp-listings-term-image">' . wp_listings_term_image(get_queried_object()->term_id, true, 'full') . '</div>';
-
 		// Start the Loop.
-		while ( have_posts() ) : the_post();
-
-			$count++; // add 1 to counter on each loop
-			$first = ($count == 1) ? 'first' : ''; // if counter is 1 add class of first
+	while ( have_posts() ) :
+		the_post();
 
+		$count++; // add 1 to counter on each loop
+		$first = ( $count == 1 ) ? 'first' : ''; // if counter is 1 add class of first
 
-			$loop = sprintf( '<div class="listing-widget-thumb"><a href="%s" class="listing-image-link">%s</a>', get_permalink(), get_the_post_thumbnail( $post->ID, 'listings' ) );
+		$loop = sprintf( '<div class="listing-widget-thumb"><a href="%s" class="listing-image-link">%s</a>', get_permalink(), get_the_post_thumbnail( $post->ID, 'listings' ) );
 
-			if ( '' != wp_listings_get_status() ) {
-				$loop .= sprintf( '<span class="listing-status %s">%s</span>', strtolower(str_replace(' ', '-', wp_listings_get_status())), wp_listings_get_status() );
-			}
+		if ( '' != wp_listings_get_status() ) {
+			$loop .= sprintf( '<span class="listing-status %s">%s</span>', strtolower( str_replace( ' ', '-', wp_listings_get_status() ) ), wp_listings_get_status() );
+		}
 
-			$loop .= sprintf( '<div class="listing-thumb-meta">' );
+		$loop .= sprintf( '<div class="listing-thumb-meta">' );
 
-			if ( '' != get_post_meta( $post->ID, '_listing_text', true ) ) {
-				$loop .= sprintf( '<span class="listing-text">%s</span>', get_post_meta( $post->ID, '_listing_text', true ) );
-			} elseif ( '' != wp_listings_get_property_types() ) {
-				$loop .= sprintf( '<span class="listing-property-type">%s</span>', wp_listings_get_property_types() );
-			}
+		if ( '' != get_post_meta( $post->ID, '_listing_text', true ) ) {
+			$loop .= sprintf( '<span class="listing-text">%s</span>', get_post_meta( $post->ID, '_listing_text', true ) );
+		} elseif ( '' != wp_listings_get_property_types() ) {
+			$loop .= sprintf( '<span class="listing-property-type">%s</span>', wp_listings_get_property_types() );
+		}
 
-			if ( '' != get_post_meta( $post->ID, '_listing_price', true ) ) {
-				$loop .= sprintf( '<span class="listing-price">%s</span>', get_post_meta( $post->ID, '_listing_price', true ) );
-			}
+		if ( '' != get_post_meta( $post->ID, '_listing_price', true ) ) {
+			$loop .= sprintf( '<span class="listing-price">%s</span>', get_post_meta( $post->ID, '_listing_price', true ) );
+		}
 
-			$loop .= sprintf( '</div><!-- .listing-thumb-meta --></div><!-- .listing-widget-thumb -->' );
+		$loop .= sprintf( '</div><!-- .listing-thumb-meta --></div><!-- .listing-widget-thumb -->' );
 
-			if ( '' != get_post_meta( $post->ID, '_listing_open_house', true ) ) {
-				$loop .= sprintf( '<span class="listing-open-house">Open House: %s</span>', get_post_meta( $post->ID, '_listing_open_house', true ) );
-			}
+		if ( '' != get_post_meta( $post->ID, '_listing_open_house', true ) ) {
+			$loop .= sprintf( '<span class="listing-open-house">Open House: %s</span>', get_post_meta( $post->ID, '_listing_open_house', true ) );
+		}
 
-			$loop .= sprintf( '<div class="listing-widget-details"><h3 class="listing-title"><a href="%s">%s</a></h3>', get_permalink(), get_the_title() );
-			$loop .= sprintf( '<p class="listing-address"><span class="listing-address">%s</span><br />', wp_listings_get_address() );
-			$loop .= sprintf( '<span class="listing-city-state-zip">%s, %s %s</span></p>', wp_listings_get_city(), wp_listings_get_state(), get_post_meta( $post->ID, '_listing_zip', true ) );
+		$loop .= sprintf( '<div class="listing-widget-details"><h3 class="listing-title"><a href="%s">%s</a></h3>', get_permalink(), get_the_title() );
+		$loop .= sprintf( '<p class="listing-address"><span class="listing-address">%s</span><br />', wp_listings_get_address() );
+		$loop .= sprintf( '<span class="listing-city-state-zip">%s, %s %s</span></p>', wp_listings_get_city(), wp_listings_get_state(), get_post_meta( $post->ID, '_listing_zip', true ) );
 
-			if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true )) {
-				$loop .= sprintf( '<ul class="listing-beds-baths-sqft"><li class="beds">%s<span>Beds</span></li> <li class="baths">%s<span>Baths</span></li> <li class="sqft">%s<span>Sq ft</span></li></ul>', get_post_meta( $post->ID, '_listing_bedrooms', true ), get_post_meta( $post->ID, '_listing_bathrooms', true ), get_post_meta( $post->ID, '_listing_sqft', true ) );
-			}
+		if ( '' != get_post_meta( $post->ID, '_listing_bedrooms', true ) || '' != get_post_meta( $post->ID, '_listing_bathrooms', true ) || '' != get_post_meta( $post->ID, '_listing_sqft', true ) ) {
+			$loop .= sprintf( '<ul class="listing-beds-baths-sqft"><li class="beds">%s<span>Beds</span></li> <li class="baths">%s<span>Baths</span></li> <li class="sqft">%s<span>Sq ft</span></li></ul>', get_post_meta( $post->ID, '_listing_bedrooms', true ), get_post_meta( $post->ID, '_listing_bathrooms', true ), get_post_meta( $post->ID, '_listing_sqft', true ) );
+		}
 
-			$loop .= sprintf('</div><!-- .listing-widget-details -->');
+		$loop .= sprintf( '</div><!-- .listing-widget-details -->' );
 
-			$loop .= sprintf( '<a href="%s" class="button btn-primary more-link">%s</a>', get_permalink(), __( 'View Listing', 'wp-listings' ) );
+		$loop .= sprintf( '<a href="%s" class="button btn-primary more-link">%s</a>', get_permalink(), __( 'View Listing', 'wp-listings' ) );
 
-			/** wrap in div with column class, and output **/
-			printf( '<article id="post-%s" class="listing entry one-third %s"><div class="listing-wrap">%s</div><!-- .listing-wrap --></article><!-- article#post-## -->', get_the_id(), $first, apply_filters( 'wp_listings_featured_listings_widget_loop', $loop ) );
+		/** wrap in div with column class, and output */
+		printf( '<article id="post-%s" class="listing entry one-third %s"><div class="listing-wrap">%s</div><!-- .listing-wrap --></article><!-- article#post-## -->', get_the_id(), $first, apply_filters( 'wp_listings_featured_listings_widget_loop', $loop ) );
 
-			if ( 3 == $count ) { // if counter is 3, reset to 0
-				$count = 0;
-			}
+		if ( 3 == $count ) { // if counter is 3, reset to 0
+			$count = 0;
+		}
 
 		endwhile;
-		if (function_exists('equity')) {
-			equity_posts_nav();
-		} elseif (function_exists('genesis_init')) {
-			genesis_posts_nav();
-		} else {
-			wp_listings_paging_nav();
-		}
+	if ( function_exists( 'equity' ) ) {
+		equity_posts_nav();
+	} elseif ( function_exists( 'genesis_init' ) ) {
+		genesis_posts_nav();
+	} else {
+		wp_listings_paging_nav();
+	}
 
 }
 
-if (function_exists('equity')) {
+if ( function_exists( 'equity' ) ) {
 
 	add_filter( 'equity_pre_get_option_site_layout', '__equity_return_full_width_content' );
 	remove_action( 'equity_entry_header', 'equity_post_info', 12 );
@@ -89,7 +88,7 @@ function archive_listing_loop() {
 
 	equity();
 
-} elseif (function_exists('genesis_init')) {
+} elseif ( function_exists( 'genesis_init' ) ) {
 
 	add_filter( 'genesis_pre_get_option_site_layout', '__genesis_return_full_width_content' );
 	remove_action( 'genesis_before_loop', 'genesis_do_breadcrumbs' );
@@ -104,7 +103,7 @@ function archive_listing_loop() {
 
 } else {
 
-get_header(); ?>
+	get_header(); ?>
 
 	<section id="primary" class="content-area container inner">
 		<div id="content" class="site-content" role="main">
@@ -115,20 +114,26 @@ function archive_listing_loop() {
 					<?php
 					$object = get_queried_object();
 
-					if ( !isset($object->label) ) {
+					if ( ! isset( $object->label ) ) {
 						$title = '<h1 class="archive-title">' . $object->name . '</h1>';
 					} else {
-						$title = '<h1 class="archive-title">' . get_bloginfo('name') . ' Listings</h1>';
+						$title = '<h1 class="archive-title">' . get_bloginfo( 'name' ) . ' Listings</h1>';
 					}
 
-					echo $title; ?>
+					echo $title;
+					?>
 
-                    <small><?php if ( function_exists('yoast_breadcrumb') ) { yoast_breadcrumb('<p id="breadcrumbs">','</p>'); } ?></small>
+					<small>
+					<?php
+					if ( function_exists( 'yoast_breadcrumb' ) ) {
+						yoast_breadcrumb( '<p id="breadcrumbs">', '</p>' ); }
+					?>
+					</small>
 				</header><!-- .archive-header -->
 
-			<?php
+				<?php
 
-			archive_listing_loop();
+				archive_listing_loop();
 
 			else :
 				// If no content, include the "No posts found" template.
@@ -141,9 +146,9 @@ function archive_listing_loop() {
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
-<?php
-get_sidebar( 'content' );
-get_sidebar();
-get_footer();
+	<?php
+	get_sidebar( 'content' );
+	get_sidebar();
+	get_footer();
 
 }
diff --git a/includes/views/create-tax.php b/includes/views/create-tax.php
index fe23667..1bc4471 100755
--- a/includes/views/create-tax.php
+++ b/includes/views/create-tax.php
@@ -19,8 +19,8 @@
 			<tfoot>
 			<tr>
 			<th scope="col" class="manage-column column-slug"><?php _e( 'ID', 'wp-listings' ); ?></th>
-			<th scope="col" class="manage-column column-singular-name"><?php _e( 'Singular Name', 'wp-listings'); ?></th>
-			<th scope="col" class="manage-column column-plural-name"><?php _e( 'Plural Name', 'wp-listings'); ?></th>
+			<th scope="col" class="manage-column column-singular-name"><?php _e( 'Singular Name', 'wp-listings' ); ?></th>
+			<th scope="col" class="manage-column column-plural-name"><?php _e( 'Plural Name', 'wp-listings' ); ?></th>
 			</tr>
 			</tfoot>
 
@@ -32,9 +32,17 @@
 				$listing_taxonomies = array_merge( $this->property_features_taxonomy(), $this->listing_status_taxonomy(), $this->property_type_taxonomy(), $this->listing_location_taxonomy(), get_option( $this->settings_field ) );
 
 				foreach ( (array) $listing_taxonomies as $id => $data ) :
-				?>
-
-				<tr <?php if ( $alt ) { echo 'class="alternate"'; $alt = false; } else { $alt = true; } ?>>
+					?>
+
+				<tr 
+					<?php
+					if ( $alt ) {
+						echo 'class="alternate"';
+						$alt = false;
+					} else {
+						$alt = true; }
+					?>
+				>
 					<td class="slug column-slug">
 
 					<?php if ( isset( $data['editable'] ) && 0 === $data['editable'] ) : ?>
@@ -51,8 +59,8 @@
 					<?php endif; ?>
 
 					</td>
-					<td class="singular-name column-singular-name"><?php echo esc_html( $data['labels']['singular_name'] )?></td>
-					<td class="plural-name column-plural-name"><?php echo esc_html( $data['labels']['name'] )?></td>
+					<td class="singular-name column-singular-name"><?php echo esc_html( $data['labels']['singular_name'] ); ?></td>
+					<td class="plural-name column-plural-name"><?php echo esc_html( $data['labels']['name'] ); ?></td>
 				</tr>
 
 				<?php endforeach; ?>
@@ -97,4 +105,4 @@
 	</div>
 	</div><!-- /col-left -->
 
-</div><!-- /col-container -->
\ No newline at end of file
+</div><!-- /col-container -->
diff --git a/includes/views/edit-tax.php b/includes/views/edit-tax.php
index 82d8950..a5d26f4 100755
--- a/includes/views/edit-tax.php
+++ b/includes/views/edit-tax.php
@@ -2,7 +2,7 @@
 $options = get_option( $this->settings_field );
 
 if ( array_key_exists( $_REQUEST['id'], (array) $options ) ) {
-	$taxonomy = stripslashes_deep( $options[$_REQUEST['id']] );
+	$taxonomy = stripslashes_deep( $options[ $_REQUEST['id'] ] );
 } else {
 	wp_die( __( "Nice try, partner. But that taxonomy doesn't exist or can't be edited. Click back and try again.", 'wp-listings' ) );
 }
@@ -39,4 +39,4 @@
 
 <?php submit_button( __( 'Update', 'wp-listings' ) ); ?>
 
-</form>
\ No newline at end of file
+</form>
diff --git a/includes/views/idx-metabox.php b/includes/views/idx-metabox.php
index 3636c60..3f35547 100755
--- a/includes/views/idx-metabox.php
+++ b/includes/views/idx-metabox.php
@@ -1,2 +1,2 @@
 <?php
-echo '<a href="http://www.idxbroker.com/features/idx-wordpress-plugin" target="_blank"><img style="max-width: 100%;" src="' . WP_LISTINGS_URL . 'images/idx-ad.png" alt="Hook up your MLS with IDX Broker"></a>';
\ No newline at end of file
+echo '<a href="http://www.idxbroker.com/features/idx-wordpress-plugin" target="_blank"><img style="max-width: 100%;" src="' . WP_LISTINGS_URL . 'images/idx-ad.png" alt="Hook up your MLS with IDX Broker"></a>';
diff --git a/includes/views/listing-details-metabox.php b/includes/views/listing-details-metabox.php
index fa42c72..fc7efff 100755
--- a/includes/views/listing-details-metabox.php
+++ b/includes/views/listing-details-metabox.php
@@ -7,112 +7,116 @@
 
 echo '<div style="width: 45%; float: left">';
 
-	foreach ( (array) $this->property_details['col1'] as $label => $key ) {
-		printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ) );
-	}
+foreach ( (array) $this->property_details['col1'] as $label => $key ) {
+	printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ) );
+}
 
 echo '</div>';
 
 echo '<div style="width: 45%; float: right;">';
 
-	foreach ( (array) $this->property_details['col2'] as $label => $key ) {
-		printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ) );
-	}
+foreach ( (array) $this->property_details['col2'] as $label => $key ) {
+	printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ) );
+}
 
 echo '</div><br style="clear: both;" />';
 
 $pattern = '<p><label>%s<br /><textarea type="text" name="wp_listings[%s]" value="%s" rows="2" style="width: 100&#37;;">%s</textarea></label></p>';
 
-_e('<h4>Extended Details:</h4>', 'wp-listings');
+_e( '<h4>Extended Details:</h4>', 'wp-listings' );
 echo '<div style="width: 45%; float: left">';
 
-	foreach ( (array) $this->extended_property_details['col1'] as $label => $key ) {
-		printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ), esc_attr( get_post_meta( $post->ID, $key, true ) ) );
-	}
+foreach ( (array) $this->extended_property_details['col1'] as $label => $key ) {
+	printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ), esc_attr( get_post_meta( $post->ID, $key, true ) ) );
+}
 
 echo '</div>';
 
 echo '<div style="width: 45%; float: right;">';
 
-	foreach ( (array) $this->extended_property_details['col2'] as $label => $key ) {
-		printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ), esc_attr( get_post_meta( $post->ID, $key, true ) ) );
-	}
+foreach ( (array) $this->extended_property_details['col2'] as $label => $key ) {
+	printf( $pattern, esc_html( $label ), $key, esc_attr( get_post_meta( $post->ID, $key, true ) ), esc_attr( get_post_meta( $post->ID, $key, true ) ) );
+}
 
 echo '</div><br style="clear: both;" />';
 
 echo '<div style="width: 45%; float: left">';
-	_e('<h4>Price Options</h4>', 'wp-listings');
-	printf( __('<p><label>Hide the price from visitors?<br /> <input type="checkbox" name="wp_listings[_listing_hide_price]" value="1" %s /></label></p>'),
-		checked( get_post_meta( $post->ID, '_listing_hide_price', true ), 1, 0 ) );
+	_e( '<h4>Price Options</h4>', 'wp-listings' );
+	printf(
+		__( '<p><label>Hide the price from visitors?<br /> <input type="checkbox" name="wp_listings[_listing_hide_price]" value="1" %s /></label></p>' ),
+		checked( get_post_meta( $post->ID, '_listing_hide_price', true ), 1, 0 )
+	);
 
-	_e('<p><label>Text to display instead of price (or leave blank):<br />', 'wp-listings');
-	printf( __( '<input type="text" name="wp_listings[_listing_price_alt]" value="%s" /></label></p>', 'wp-listings' ), htmlentities( get_post_meta( $post->ID, '_listing_price_alt', true) ) );
-echo '</div>';
+	_e( '<p><label>Text to display instead of price (or leave blank):<br />', 'wp-listings' );
+	printf( __( '<input type="text" name="wp_listings[_listing_price_alt]" value="%s" /></label></p>', 'wp-listings' ), htmlentities( get_post_meta( $post->ID, '_listing_price_alt', true ) ) );
+	echo '</div>';
 
-echo '<div style="width: 90%; float: left;">';
+	echo '<div style="width: 90%; float: left;">';
 
-	_e('<h4>Custom Overlay Text</h4>', 'wp-listings');
-	_e('<p><label>Custom text to display as overlay on featured listings<br />', 'wp-listings');
-	printf( __( '<input type="text" name="wp_listings[_listing_text]" value="%s" /></label></p>', 'wp-listings' ), htmlentities( get_post_meta( $post->ID, '_listing_text', true) ) );
+	_e( '<h4>Custom Overlay Text</h4>', 'wp-listings' );
+	_e( '<p><label>Custom text to display as overlay on featured listings<br />', 'wp-listings' );
+	printf( __( '<input type="text" name="wp_listings[_listing_text]" value="%s" /></label></p>', 'wp-listings' ), htmlentities( get_post_meta( $post->ID, '_listing_text', true ) ) );
 
-echo '</div><br style="clear: both;" /><br /><br /><hr>';
+	echo '</div><br style="clear: both;" /><br /><br /><hr>';
 
-echo '<div style="width: 100%; float: left;">';
+	echo '<div style="width: 100%; float: left;">';
 
-	_e('<p><label>Photo Gallery (use Add Media button to insert Gallery):<br />', 'wp-listings');
+	_e( '<p><label>Photo Gallery (use Add Media button to insert Gallery):<br />', 'wp-listings' );
 
-	$wplistings_gallery_content = get_post_meta( $post->ID, '_listing_gallery', true);
+	$wplistings_gallery_content   = get_post_meta( $post->ID, '_listing_gallery', true );
 	$wplistings_gallery_editor_id = '_listing_gallery';
 
 	$wplistings_gallery_editor_settings = array(
-			'wpautop' 			=> false,
-			'textarea_name' 	=> 'wp_listings[_listing_gallery]',
-			'editor_class'		=> 'wplistings_gallery',
-			'textarea_rows'		=> 20,
-			'tinymce'			=> true,
-			'quicktags'			=> true,
-			'drag_drop_upload'	=> true
-		);
+		'wpautop'          => false,
+		'textarea_name'    => 'wp_listings[_listing_gallery]',
+		'editor_class'     => 'wplistings_gallery',
+		'textarea_rows'    => 20,
+		'tinymce'          => true,
+		'quicktags'        => true,
+		'drag_drop_upload' => true,
+	);
 
-	wp_editor($wplistings_gallery_content, $wplistings_gallery_editor_id, $wplistings_gallery_editor_settings);
+	wp_editor( $wplistings_gallery_content, $wplistings_gallery_editor_id, $wplistings_gallery_editor_settings );
 
-echo '</div><br style="clear: both;" /><br /><br />';
+	echo '</div><br style="clear: both;" /><br /><br />';
 
-echo '<div style="width: 90%; float: left;">';
+	echo '<div style="width: 90%; float: left;">';
 
-	_e('<p><label>Enter Video or Virtual Tour Embed Code (<a href="https://wordpress.org/plugins/jetpack/" target="_blank" rel="nofollow">Jetpack</a> offers several <a href="http://jetpack.me/support/shortcode-embeds/" target="_blank" rel="nofollow">video shortcodes</a>.):<br />', 'wp-listings');
-	printf( __( '<textarea name="wp_listings[_listing_video]" rows="5" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_video', true) ) );
+	_e( '<p><label>Enter Video or Virtual Tour Embed Code (<a href="https://wordpress.org/plugins/jetpack/" target="_blank" rel="nofollow">Jetpack</a> offers several <a href="http://jetpack.me/support/shortcode-embeds/" target="_blank" rel="nofollow">video shortcodes</a>.):<br />', 'wp-listings' );
+	printf( __( '<textarea name="wp_listings[_listing_video]" rows="5" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_video', true ) ) );
 
-echo '</div><br style="clear: both;" />';
+	echo '</div><br style="clear: both;" />';
 
-echo '<div style="width: 90%; float: left;">';
+	echo '<div style="width: 90%; float: left;">';
 
-echo '<div style="width: 45%; float: left">';
-	_e('<h4>Map Options</h4>', 'wp-listings');
+	echo '<div style="width: 45%; float: left">';
+	_e( '<h4>Map Options</h4>', 'wp-listings' );
 
-	if(get_post_meta($post->ID, '_listing_automap', 1) == FALSE) {
-    	update_post_meta($post->ID, '_listing_automap', 'y');
-    }
-	printf( __('<p><label>Automatically insert map based on latitude/longitude? <strong>Will be overridden if a shortode is entered below.</strong><br /> <input type="radio" name="wp_listings[_listing_automap]" value="y" %s>Yes</input> <input type="radio" name="wp_listings[_listing_automap]" value="n" %s>No</input></label></p>'),
+	if ( get_post_meta( $post->ID, '_listing_automap', 1 ) == false ) {
+		update_post_meta( $post->ID, '_listing_automap', 'y' );
+	}
+	printf(
+		__( '<p><label>Automatically insert map based on latitude/longitude? <strong>Will be overridden if a shortode is entered below.</strong><br /> <input type="radio" name="wp_listings[_listing_automap]" value="y" %1$s>Yes</input> <input type="radio" name="wp_listings[_listing_automap]" value="n" %2$s>No</input></label></p>' ),
 		checked( get_post_meta( $post->ID, '_listing_automap', true ), 'y', 0 ),
-		checked( get_post_meta( $post->ID, '_listing_automap', true ), 'n', 0 ) );
-echo '</div>';
-echo '<div style="clear: both; width: 45%; float: left;">';
-	printf( __('<p><label>Latitude: <br /><input type="text" name="wp_listings[_listing_latitude]" value="%s" /></label></p>', 'wp-listings'), get_post_meta( $post->ID, '_listing_latitude', true) );
-echo '</div>';
-echo '<div style="width: 45%; float: right;">';
-	printf( __('<p><label>Longitude: <br /><input type="text" name="wp_listings[_listing_longitude]" value="%s" /></label></p>', 'wp-listings'), get_post_meta( $post->ID, '_listing_longitude', true) );
-echo '</div><br style="clear: both;" />';
+		checked( get_post_meta( $post->ID, '_listing_automap', true ), 'n', 0 )
+	);
+	echo '</div>';
+	echo '<div style="clear: both; width: 45%; float: left;">';
+	printf( __( '<p><label>Latitude: <br /><input type="text" name="wp_listings[_listing_latitude]" value="%s" /></label></p>', 'wp-listings' ), get_post_meta( $post->ID, '_listing_latitude', true ) );
+	echo '</div>';
+	echo '<div style="width: 45%; float: right;">';
+	printf( __( '<p><label>Longitude: <br /><input type="text" name="wp_listings[_listing_longitude]" value="%s" /></label></p>', 'wp-listings' ), get_post_meta( $post->ID, '_listing_longitude', true ) );
+	echo '</div><br style="clear: both;" />';
 
-	_e('<p><label>Or enter Map Embed Code or shortcode from Map plugin (such as <a href="http://jetpack.me/support/shortcode-embeds/" target="_blank" rel="nofollow">Jetpack Shortcodes</a>, <a href="https://wordpress.org/plugins/simple-google-maps-short-code/" target="_blank" rel="nofollow">Simple Google Maps Short Code</a> or <a href="https://wordpress.org/plugins/mappress-google-maps-for-wordpress/" target="_blank" rel="nofollow">MapPress</a>):<br /><em>Recommend size: 660x300 (If possible, use 100% width, or your themes content width)</em><br />', 'wp-listings');
-	printf( __( '<textarea name="wp_listings[_listing_map]" rows="5" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_map', true) ) );
+	_e( '<p><label>Or enter Map Embed Code or shortcode from Map plugin (such as <a href="http://jetpack.me/support/shortcode-embeds/" target="_blank" rel="nofollow">Jetpack Shortcodes</a>, <a href="https://wordpress.org/plugins/simple-google-maps-short-code/" target="_blank" rel="nofollow">Simple Google Maps Short Code</a> or <a href="https://wordpress.org/plugins/mappress-google-maps-for-wordpress/" target="_blank" rel="nofollow">MapPress</a>):<br /><em>Recommend size: 660x300 (If possible, use 100% width, or your themes content width)</em><br />', 'wp-listings' );
+	printf( __( '<textarea name="wp_listings[_listing_map]" rows="5" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_map', true ) ) );
 
-echo '</div>';
+	echo '</div>';
 
-echo '<div style="width: 90%; float: left;">';
-	_e('<h4>Contact Form</h4>', 'wp-listings');
+	echo '<div style="width: 90%; float: left;">';
+	_e( '<h4>Contact Form</h4>', 'wp-listings' );
 
-	_e('<p><label>If you use a Contact Form plugin, you may enter the Contact Form shortcode here. Otherwise, the single listing template will use a default contact form:<br />', 'wp-listings');
-	printf( __( '<textarea name="wp_listings[_listing_contact_form]" rows="1" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_contact_form', true) ) );
+	_e( '<p><label>If you use a Contact Form plugin, you may enter the Contact Form shortcode here. Otherwise, the single listing template will use a default contact form:<br />', 'wp-listings' );
+	printf( __( '<textarea name="wp_listings[_listing_contact_form]" rows="1" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_contact_form', true ) ) );
 
-echo '</div><br style="clear: both;" />';
+	echo '</div><br style="clear: both;" />';
diff --git a/includes/views/listing-features-metabox.php b/includes/views/listing-features-metabox.php
index 1011edc..466edea 100755
--- a/includes/views/listing-features-metabox.php
+++ b/includes/views/listing-features-metabox.php
@@ -5,49 +5,48 @@
 
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Featured on (allows shortcodes):<br /><textarea name="wp_listings[_listing_featured_on]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_featured_on', true) ) );
+	printf( __( '<p><label>Featured on (allows shortcodes):<br /><textarea name="wp_listings[_listing_featured_on]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_featured_on', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // Home Summary
-
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Home Summary (allows shortcodes):<br /><textarea name="wp_listings[_listing_home_sum]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_home_sum', true) ) );
+	printf( __( '<p><label>Home Summary (allows shortcodes):<br /><textarea name="wp_listings[_listing_home_sum]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_home_sum', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // Kitchen Summary
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Kitchen Summary (allows shortcodes):<br /><textarea name="wp_listings[_listing_kitchen_sum]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_kitchen_sum', true) ) );
+	printf( __( '<p><label>Kitchen Summary (allows shortcodes):<br /><textarea name="wp_listings[_listing_kitchen_sum]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_kitchen_sum', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // Living Room
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Living Room (allows shortcodes):<br /><textarea name="wp_listings[_listing_living_room]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_living_room', true) ) );
+	printf( __( '<p><label>Living Room (allows shortcodes):<br /><textarea name="wp_listings[_listing_living_room]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_living_room', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // Master Suite
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Master Suite (allows shortcodes):<br /><textarea name="wp_listings[_listing_master_suite]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_master_suite', true) ) );
+	printf( __( '<p><label>Master Suite (allows shortcodes):<br /><textarea name="wp_listings[_listing_master_suite]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_master_suite', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // School and Neighborhood Info
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>School and Neighborhood Info (allows shortcodes):<br /><textarea name="wp_listings[_listing_school_neighborhood]" rows="5" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_school_neighborhood', true) ) );
+	printf( __( '<p><label>School and Neighborhood Info (allows shortcodes):<br /><textarea name="wp_listings[_listing_school_neighborhood]" rows="5" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_school_neighborhood', true ) ) );
 
 echo '</div><br style="clear: both;" />';
 
 // Disclaimer
 echo '<div style="width: 90%; float: left;">';
 
-	printf( __( '<p><label>Disclaimer:<br /><textarea name="wp_listings[_listing_disclaimer]" rows="3" cols="18" style="%s">%s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_disclaimer', true) ) );
+	printf( __( '<p><label>Disclaimer:<br /><textarea name="wp_listings[_listing_disclaimer]" rows="3" cols="18" style="%1$s">%2$s</textarea></label></p>', 'wp-listings' ), 'width: 99%;', htmlentities( get_post_meta( $post->ID, '_listing_disclaimer', true ) ) );
 
 echo '</div><br style="clear: both;" />';
diff --git a/includes/views/reorder-tax.php b/includes/views/reorder-tax.php
index ed4004e..698eed7 100755
--- a/includes/views/reorder-tax.php
+++ b/includes/views/reorder-tax.php
@@ -12,31 +12,32 @@
  * @since 0.1.0
  */
 
-add_action('admin_menu', 'wp_listings_tax_reorder_init', 20);
+add_action( 'admin_menu', 'wp_listings_tax_reorder_init', 20 );
 function wp_listings_tax_reorder_init() {
-	add_submenu_page( 'edit.php?post_type=listing', __( 'Reorder Taxonomies', 'wp-listings' ), __( 'Reorder Taxonomies', 'wp-listings' ), 'manage_options', 'wplistings-tax-reorder', 'wp_listings_tax_reorder');
+	add_submenu_page( 'edit.php?post_type=listing', __( 'Reorder Taxonomies', 'wp-listings' ), __( 'Reorder Taxonomies', 'wp-listings' ), 'manage_options', 'wplistings-tax-reorder', 'wp_listings_tax_reorder' );
 }
 
 add_action( 'admin_enqueue_scripts', 'wp_listings_tax_reorder_enqueue' );
 function wp_listings_tax_reorder_enqueue() {
-		wp_enqueue_script('jquery-ui-sortable');
+		wp_enqueue_script( 'jquery-ui-sortable' );
 }
 
 function wp_listings_tax_reorder() {
-	$wp_listings_taxes = get_option('wp_listings_taxonomies');
+	$wp_listings_taxes = get_option( 'wp_listings_taxonomies' );
 
-	if($_POST) {
-		$new_order = $_POST['wplistings-tax'];
+	if ( $_POST ) {
+		$new_order                   = $_POST['wplistings-tax'];
 		$wp_listings_taxes_reordered = array();
-		foreach( $new_order as $tax ) {
-			if($wp_listings_taxes[$tax])
-				$wp_listings_taxes_reordered[$tax] = $wp_listings_taxes[$tax];	
+		foreach ( $new_order as $tax ) {
+			if ( $wp_listings_taxes[ $tax ] ) {
+				$wp_listings_taxes_reordered[ $tax ] = $wp_listings_taxes[ $tax ];
+			}
 		}
 		$wp_listings_taxes = $wp_listings_taxes_reordered;
-		update_option('wp_listings_taxonomies', $wp_listings_taxes_reordered);
-		
+		update_option( 'wp_listings_taxonomies', $wp_listings_taxes_reordered );
+
 	}
-screen_icon( 'themes' ); ?>
+	screen_icon( 'themes' ); ?>
 <h2><?php _e( 'Reorder Taxonomies', 'wp-listings' ); ?></h2>
 <div id="col-container">
 <style>
@@ -71,26 +72,26 @@ function wp_listings_tax_reorder() {
 	});
 	</script>
 	<div id="col-left">
-		<?php print_r($wp_listings_taxes); ?>
+		<?php print_r( $wp_listings_taxes ); ?>
 	<div class="col-wrap">
-    <span>Drag and Drop to reorder</span>
+	<span>Drag and Drop to reorder</span>
 	<form method="post">
 	<ul id="sortable">
-    	<?php foreach($wp_listings_taxes as $wp_listings_tax_key => $wp_listings_tax_value) { ?>
-        	<li class="ui-state-default">
-            	<div class="item">
+		<?php foreach ( $wp_listings_taxes as $wp_listings_tax_key => $wp_listings_tax_value ) { ?>
+			<li class="ui-state-default">
+				<div class="item">
 					<?php echo $wp_listings_tax_value['labels']['name']; ?><input type="hidden" id="wplistings-tax[]" name="wplistings-tax[]" value="<?php echo $wp_listings_tax_key; ?>" />
-                </div>
-            </li>
-        <?php } ?>
+				</div>
+			</li>
+		<?php } ?>
 	</ul>
-    <input class="wplistings-submit" type="submit" value="Save" />
+	<input class="wplistings-submit" type="submit" value="Save" />
 	</form>
 	</div>
 	</div><!-- /col-left -->
 
 </div><!-- /col-container -->
-<?php
+	<?php
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/views/single-listing.php b/includes/views/single-listing.php
index 62b5b7b..fc6bfd5 100755
--- a/includes/views/single-listing.php
+++ b/includes/views/single-listing.php
@@ -6,41 +6,50 @@
  * @since 0.1.0
  */
 
-add_action('wp_enqueue_scripts', 'enqueue_single_listing_scripts');
+add_action( 'wp_enqueue_scripts', 'enqueue_single_listing_scripts' );
 function enqueue_single_listing_scripts() {
 	wp_enqueue_style( 'wp-listings-single' );
 	wp_enqueue_style( 'font-awesome-4.7.0' );
-	wp_enqueue_script( 'jquery-validate', array('jquery'), true, true );
-	wp_enqueue_script( 'fitvids', array('jquery'), true, true );
-	wp_enqueue_script( 'wp-listings-single', array('jquery, jquery-ui-tabs', 'jquery-validate'), true, true );
+	wp_enqueue_script( 'jquery-validate', array( 'jquery' ), true, true );
+	wp_enqueue_script( 'fitvids', array( 'jquery' ), true, true );
+	wp_enqueue_script( 'wp-listings-single', array( 'jquery, jquery-ui-tabs', 'jquery-validate' ), true, true );
 }
 
 function single_listing_post_content() {
 
 	global $post;
-	$options = get_option('plugin_wp_listings_settings');
+	$options = get_option( 'plugin_wp_listings_settings' );
 
 	?>
 
 	<div itemscope itemtype="http://schema.org/SingleFamilyResidence" class="entry-content wplistings-single-listing">
 
 		<div class="listing-image-wrap">
-			<?php echo '<div itemprop="image" itemscope itemtype="http://schema.org/ImageObject">'. get_the_post_thumbnail( $post->ID, 'listings-full', array('class' => 'single-listing-image', 'itemprop'=>'contentUrl') ) . '</div>';
+			<?php
+			echo '<div itemprop="image" itemscope itemtype="http://schema.org/ImageObject">' . get_the_post_thumbnail(
+				$post->ID,
+				'listings-full',
+				array(
+					'class'    => 'single-listing-image',
+					'itemprop' => 'contentUrl',
+				)
+			) . '</div>';
 			if ( '' != wp_listings_get_status() ) {
-				printf( '<span class="listing-status %s">%s</span>', strtolower(str_replace(' ', '-', wp_listings_get_status())), wp_listings_get_status() );
+				printf( '<span class="listing-status %s">%s</span>', strtolower( str_replace( ' ', '-', wp_listings_get_status() ) ), wp_listings_get_status() );
 			}
 			if ( '' != get_post_meta( $post->ID, '_listing_open_house', true ) ) {
 				printf( '<span class="listing-open-house">Open House: %s</span>', get_post_meta( $post->ID, '_listing_open_house', true ) );
-			} ?>
+			}
+			?>
 		</div><!-- .listing-image-wrap -->
 
 		<?php
-		$listing_meta = sprintf( '<ul class="listing-meta">');
+		$listing_meta = sprintf( '<ul class="listing-meta">' );
 
-		if ( get_post_meta($post->ID, '_listing_hide_price', true) == 1 ) {
-			$listing_meta .= (get_post_meta($post->ID, '_listing_price_alt', true)) ? sprintf( '<li class="listing-price">%s</li>', get_post_meta( $post->ID, '_listing_price_alt', true ) ) : '';
+		if ( get_post_meta( $post->ID, '_listing_hide_price', true ) == 1 ) {
+			$listing_meta .= ( get_post_meta( $post->ID, '_listing_price_alt', true ) ) ? sprintf( '<li class="listing-price">%s</li>', get_post_meta( $post->ID, '_listing_price_alt', true ) ) : '';
 		} else {
-			$listing_meta .= sprintf( '<li class="listing-price">%s %s %s</li>', '<span class="currency-symbol">' . $options['wp_listings_currency_symbol'] . '</span>', get_post_meta( $post->ID, '_listing_price', true ), (isset($options['wp_listings_display_currency_code']) && $options['wp_listings_display_currency_code'] == 1) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>' : '' );
+			$listing_meta .= sprintf( '<li class="listing-price">%s %s %s</li>', '<span class="currency-symbol">' . $options['wp_listings_currency_symbol'] . '</span>', get_post_meta( $post->ID, '_listing_price', true ), ( isset( $options['wp_listings_display_currency_code'] ) && $options['wp_listings_display_currency_code'] == 1 ) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>' : '' );
 		}
 
 		if ( '' != wp_listings_get_property_types() ) {
@@ -71,11 +80,11 @@ function single_listing_post_content() {
 			$listing_meta .= sprintf( '<li class="listing-acres"><span class="label">Acres: </span>%s</li>', get_post_meta( $post->ID, '_listing_acres', true ) );
 		}
 
-		$listing_meta .= sprintf( '</ul>');
+		$listing_meta .= sprintf( '</ul>' );
 
 		echo $listing_meta;
 
-		echo (get_post_meta($post->ID, '_listing_courtesy', true)) ? '<p class="wp-listings-courtesy">' . get_post_meta($post->ID, '_listing_courtesy', true) . '</p>' : '';
+		echo ( get_post_meta( $post->ID, '_listing_courtesy', true ) ) ? '<p class="wp-listings-courtesy">' . get_post_meta( $post->ID, '_listing_courtesy', true ) . '</p>' : '';
 
 		?>
 
@@ -87,32 +96,33 @@ function single_listing_post_content() {
 				<li><a href="#listing-details">Details</a></li>
 
 
-				<?php if (get_post_meta( $post->ID, '_listing_gallery', true) != '') { ?>
+				<?php if ( get_post_meta( $post->ID, '_listing_gallery', true ) != '' ) { ?>
 					<li><a href="#listing-gallery">Photos</a></li>
 				<?php } ?>
 
-				<?php if (get_post_meta( $post->ID, '_listing_video', true) != '') { ?>
+				<?php if ( get_post_meta( $post->ID, '_listing_video', true ) != '' ) { ?>
 					<li><a href="#listing-video">Video / Virtual Tour</a></li>
 				<?php } ?>
 
-				<?php if (get_post_meta( $post->ID, '_listing_school_neighborhood', true) != '') { ?>
+				<?php if ( get_post_meta( $post->ID, '_listing_school_neighborhood', true ) != '' ) { ?>
 				<li><a href="#listing-school-neighborhood">Schools &amp; Neighborhood</a></li>
 				<?php } ?>
 			</ul>
 
 			<div id="listing-description" itemprop="description">
-				<?php the_content( __( 'View more <span class="meta-nav">&rarr;</span>', 'wp-listings' ) );
+				<?php
+				the_content( __( 'View more <span class="meta-nav">&rarr;</span>', 'wp-listings' ) );
 
-				echo (get_post_meta($post->ID, '_listing_featured_on', true)) ? '<p class="wp_listings_featured_on">' . get_post_meta($post->ID, '_listing_featured_on', true) . '</p>' : '';
+				echo ( get_post_meta( $post->ID, '_listing_featured_on', true ) ) ? '<p class="wp_listings_featured_on">' . get_post_meta( $post->ID, '_listing_featured_on', true ) . '</p>' : '';
 
-				if( get_post_meta($post->ID, '_listing_disclaimer', true) ) {
-					echo '<p class="wp-listings-disclaimer">' . get_post_meta($post->ID, '_listing_disclaimer', true) . '</p>';
-				} elseif ($options['wp_listings_global_disclaimer'] != '' && $options['wp_listings_global_disclaimer'] != null) {
+				if ( get_post_meta( $post->ID, '_listing_disclaimer', true ) ) {
+					echo '<p class="wp-listings-disclaimer">' . get_post_meta( $post->ID, '_listing_disclaimer', true ) . '</p>';
+				} elseif ( $options['wp_listings_global_disclaimer'] != '' && $options['wp_listings_global_disclaimer'] != null ) {
 					echo '<p class="wp-listings-disclaimer">' . $options['wp_listings_global_disclaimer'] . '</p>';
 				}
 
-				if(class_exists('Idx_Broker_Plugin') && $options['wp_listings_display_idx_link'] == true && get_post_meta($post->ID, '_listing_details_url', true)) {
-					echo '<a href="' . get_post_meta($post->ID, '_listing_details_url', true) . '" title="' . get_post_meta($post->ID, '_listing_mls', true) . '">View full listing details</a>';
+				if ( class_exists( 'Idx_Broker_Plugin' ) && $options['wp_listings_display_idx_link'] == true && get_post_meta( $post->ID, '_listing_details_url', true ) ) {
+					echo '<a href="' . get_post_meta( $post->ID, '_listing_details_url', true ) . '" title="' . get_post_meta( $post->ID, '_listing_mls', true ) . '">View full listing details</a>';
 				}
 				?>
 			</div><!-- #listing-description -->
@@ -125,96 +135,98 @@ function single_listing_post_content() {
 
 					echo '<table class="listing-details">';
 
-                    echo '<tbody class="left">';
-                    if ( get_post_meta($post->ID, '_listing_hide_price', true) == 1 ) {
-                    	echo (get_post_meta($post->ID, '_listing_price_alt', true)) ? '<tr class="wp_listings_listing_price"><td class="label">' . __('Price:', 'wp-listings') . '</td><td>'.get_post_meta( $post->ID, '_listing_price_alt', true) .'</td></tr>' : '';
-                	} elseif(get_post_meta($post->ID, '_listing_price', true)) {
-                    	echo '<tr class="wp_listings_listing_price"><td class="label">' . __('Price:', 'wp-listings') . '</td><td><span class="currency-symbol">' . $options['wp_listings_currency_symbol'] . '</span>';
-                    	echo get_post_meta( $post->ID, '_listing_price', true) . ' ';
-                    	echo (isset($options['wp_listings_display_currency_code']) && $options['wp_listings_display_currency_code'] == 1) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>' : '';
-                    	echo '</td></tr>';
-                	}
-                    echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
-                    echo (get_post_meta($post->ID, '_listing_address', true)) ? '<tr class="wp_listings_listing_address"><td class="label">' . __('Address:', 'wp-listings') . '</td><td itemprop="streetAddress">'.get_post_meta( $post->ID, '_listing_address', true) .'</td></tr>' : '';
-                    echo (get_post_meta($post->ID, '_listing_city', true)) ? '<tr class="wp_listings_listing_city"><td class="label">' . __('City:', 'wp-listings') . '</td><td itemprop="addressLocality">'.get_post_meta( $post->ID, '_listing_city', true) .'</td></tr>' : '';
-                    echo (get_post_meta($post->ID, '_listing_county', true)) ? '<tr class="wp_listings_listing_county"><td class="label">' . __('County:', 'wp-listings') . '</td><td>'.get_post_meta( $post->ID, '_listing_county', true) .'</td></tr>' : '';
-                    echo (get_post_meta($post->ID, '_listing_state', true)) ? '<tr class="wp_listings_listing_state"><td class="label">' . __('State:', 'wp-listings') . '</td><td itemprop="addressRegion">'.get_post_meta( $post->ID, '_listing_state', true) .'</td></tr>' : '';
-                    echo (get_post_meta($post->ID, '_listing_zip', true)) ? '<tr class="wp_listings_listing_zip"><td class="label">' . __('Zip Code:', 'wp-listings') . '</td><td itemprop="postalCode">'.get_post_meta( $post->ID, '_listing_zip', true) .'</td></tr>' : '';
-                    echo '</div>';
-                    echo (get_post_meta($post->ID, '_listing_mls', true)) ? '<tr class="wp_listings_listing_mls"><td class="label">MLS:</td><td>'.get_post_meta( $post->ID, '_listing_mls', true) .'</td></tr>' : '';
-                    echo '</tbody>';
+					echo '<tbody class="left">';
+				if ( get_post_meta( $post->ID, '_listing_hide_price', true ) == 1 ) {
+					echo ( get_post_meta( $post->ID, '_listing_price_alt', true ) ) ? '<tr class="wp_listings_listing_price"><td class="label">' . __( 'Price:', 'wp-listings' ) . '</td><td>' . get_post_meta( $post->ID, '_listing_price_alt', true ) . '</td></tr>' : '';
+				} elseif ( get_post_meta( $post->ID, '_listing_price', true ) ) {
+					echo '<tr class="wp_listings_listing_price"><td class="label">' . __( 'Price:', 'wp-listings' ) . '</td><td><span class="currency-symbol">' . $options['wp_listings_currency_symbol'] . '</span>';
+					echo get_post_meta( $post->ID, '_listing_price', true ) . ' ';
+					echo ( isset( $options['wp_listings_display_currency_code'] ) && $options['wp_listings_display_currency_code'] == 1 ) ? '<span class="currency-code">' . $options['wp_listings_currency_code'] . '</span>' : '';
+					echo '</td></tr>';
+				}
+					echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+					echo ( get_post_meta( $post->ID, '_listing_address', true ) ) ? '<tr class="wp_listings_listing_address"><td class="label">' . __( 'Address:', 'wp-listings' ) . '</td><td itemprop="streetAddress">' . get_post_meta( $post->ID, '_listing_address', true ) . '</td></tr>' : '';
+					echo ( get_post_meta( $post->ID, '_listing_city', true ) ) ? '<tr class="wp_listings_listing_city"><td class="label">' . __( 'City:', 'wp-listings' ) . '</td><td itemprop="addressLocality">' . get_post_meta( $post->ID, '_listing_city', true ) . '</td></tr>' : '';
+					echo ( get_post_meta( $post->ID, '_listing_county', true ) ) ? '<tr class="wp_listings_listing_county"><td class="label">' . __( 'County:', 'wp-listings' ) . '</td><td>' . get_post_meta( $post->ID, '_listing_county', true ) . '</td></tr>' : '';
+					echo ( get_post_meta( $post->ID, '_listing_state', true ) ) ? '<tr class="wp_listings_listing_state"><td class="label">' . __( 'State:', 'wp-listings' ) . '</td><td itemprop="addressRegion">' . get_post_meta( $post->ID, '_listing_state', true ) . '</td></tr>' : '';
+					echo ( get_post_meta( $post->ID, '_listing_zip', true ) ) ? '<tr class="wp_listings_listing_zip"><td class="label">' . __( 'Zip Code:', 'wp-listings' ) . '</td><td itemprop="postalCode">' . get_post_meta( $post->ID, '_listing_zip', true ) . '</td></tr>' : '';
+					echo '</div>';
+					echo ( get_post_meta( $post->ID, '_listing_mls', true ) ) ? '<tr class="wp_listings_listing_mls"><td class="label">MLS:</td><td>' . get_post_meta( $post->ID, '_listing_mls', true ) . '</td></tr>' : '';
+					echo '</tbody>';
 
 					echo '<tbody class="right">';
-					foreach ( (array) $details_instance->property_details['col2'] as $label => $key ) {
-						$detail_value = esc_html( get_post_meta($post->ID, $key, true) );
-						if (! empty( $detail_value ) ) :
-							printf( $pattern, $key, esc_html( $label ), $detail_value );
+				foreach ( (array) $details_instance->property_details['col2'] as $label => $key ) {
+					$detail_value = esc_html( get_post_meta( $post->ID, $key, true ) );
+					if ( ! empty( $detail_value ) ) :
+						printf( $pattern, $key, esc_html( $label ), $detail_value );
 						endif;
-					}
+				}
 					echo '</tbody>';
 
 					echo '</table>';
 
 					echo '<table class="listing-details extended">';
 					echo '<tbody class="left">';
-					foreach ( (array) $details_instance->extended_property_details['col1'] as $label => $key ) {
-						$detail_value = esc_html( get_post_meta($post->ID, $key, true) );
-						if (! empty( $detail_value ) ) :
-							printf( $pattern, $key, esc_html( $label ), $detail_value );
+				foreach ( (array) $details_instance->extended_property_details['col1'] as $label => $key ) {
+					$detail_value = esc_html( get_post_meta( $post->ID, $key, true ) );
+					if ( ! empty( $detail_value ) ) :
+						printf( $pattern, $key, esc_html( $label ), $detail_value );
 						endif;
-					}
+				}
 					echo '</tbody>';
 					echo '<tbody class="right">';
-					foreach ( (array) $details_instance->extended_property_details['col2'] as $label => $key ) {
-						$detail_value = esc_html( get_post_meta($post->ID, $key, true) );
-						if (! empty( $detail_value ) ) :
-							printf( $pattern, $key, esc_html( $label ), $detail_value );
+				foreach ( (array) $details_instance->extended_property_details['col2'] as $label => $key ) {
+					$detail_value = esc_html( get_post_meta( $post->ID, $key, true ) );
+					if ( ! empty( $detail_value ) ) :
+						printf( $pattern, $key, esc_html( $label ), $detail_value );
 						endif;
-					}
+				}
 					echo '</tbody>';
 					echo '</table>';
 
-				if(get_the_term_list( get_the_ID(), 'features', '<li>', '</li><li>', '</li>' ) != null) {
-					echo '<h5>' . __('Tagged Features:', 'wp-listings') . '</h5><ul class="tagged-features">';
+				if ( get_the_term_list( get_the_ID(), 'features', '<li>', '</li><li>', '</li>' ) != null ) {
+					echo '<h5>' . __( 'Tagged Features:', 'wp-listings' ) . '</h5><ul class="tagged-features">';
 					echo get_the_term_list( get_the_ID(), 'features', '<li>', '</li><li>', '</li>' );
 					echo '</ul><!-- .tagged-features -->';
 				}
 
-				if ( get_post_meta( $post->ID, '_listing_home_sum', true) != '' || get_post_meta( $post->ID, '_listing_kitchen_sum', true) != '' || get_post_meta( $post->ID, '_listing_living_room', true) != '' || get_post_meta( $post->ID, '_listing_master_suite', true) != '') { ?>
+				if ( get_post_meta( $post->ID, '_listing_home_sum', true ) != '' || get_post_meta( $post->ID, '_listing_kitchen_sum', true ) != '' || get_post_meta( $post->ID, '_listing_living_room', true ) != '' || get_post_meta( $post->ID, '_listing_master_suite', true ) != '' ) {
+					?>
 					<div class="additional-features">
 						<h4>Additional Features</h4>
-						<h6 class="label"><?php _e("Home Summary", 'wp-listings'); ?></h6>
-						<p class="value"><?php echo do_shortcode(get_post_meta( $post->ID, '_listing_home_sum', true)); ?></p>
-						<h6 class="label"><?php _e("Kitchen Summary", 'wp-listings'); ?></h6>
-						<p class="value"><?php echo do_shortcode(get_post_meta( $post->ID, '_listing_kitchen_sum', true)); ?></p>
-						<h6 class="label"><?php _e("Living Room", 'wp-listings'); ?></h6>
-						<p class="value"><?php echo do_shortcode(get_post_meta( $post->ID, '_listing_living_room', true)); ?></p>
-						<h6 class="label"><?php _e("Master Suite", 'wp-listings'); ?></h6>
-						<p class="value"><?php echo do_shortcode(get_post_meta( $post->ID, '_listing_master_suite', true)); ?></p>
+						<h6 class="label"><?php _e( 'Home Summary', 'wp-listings' ); ?></h6>
+						<p class="value"><?php echo do_shortcode( get_post_meta( $post->ID, '_listing_home_sum', true ) ); ?></p>
+						<h6 class="label"><?php _e( 'Kitchen Summary', 'wp-listings' ); ?></h6>
+						<p class="value"><?php echo do_shortcode( get_post_meta( $post->ID, '_listing_kitchen_sum', true ) ); ?></p>
+						<h6 class="label"><?php _e( 'Living Room', 'wp-listings' ); ?></h6>
+						<p class="value"><?php echo do_shortcode( get_post_meta( $post->ID, '_listing_living_room', true ) ); ?></p>
+						<h6 class="label"><?php _e( 'Master Suite', 'wp-listings' ); ?></h6>
+						<p class="value"><?php echo do_shortcode( get_post_meta( $post->ID, '_listing_master_suite', true ) ); ?></p>
 					</div><!-- .additional-features -->
-				<?php
-				} ?>
+					<?php
+				}
+				?>
 
 			</div><!-- #listing-details -->
 
-			<?php if (get_post_meta( $post->ID, '_listing_gallery', true) != '') { ?>
+			<?php if ( get_post_meta( $post->ID, '_listing_gallery', true ) != '' ) { ?>
 			<div id="listing-gallery">
-				<?php echo do_shortcode(get_post_meta( $post->ID, '_listing_gallery', true)); ?>
+				<?php echo do_shortcode( get_post_meta( $post->ID, '_listing_gallery', true ) ); ?>
 			</div><!-- #listing-gallery -->
 			<?php } ?>
 
-			<?php if (get_post_meta( $post->ID, '_listing_video', true) != '') { ?>
+			<?php if ( get_post_meta( $post->ID, '_listing_video', true ) != '' ) { ?>
 			<div id="listing-video">
 				<div class="iframe-wrap">
-				<?php echo do_shortcode(get_post_meta( $post->ID, '_listing_video', true)); ?>
+				<?php echo do_shortcode( get_post_meta( $post->ID, '_listing_video', true ) ); ?>
 				</div>
 			</div><!-- #listing-video -->
 			<?php } ?>
 
-			<?php if (get_post_meta( $post->ID, '_listing_school_neighborhood', true) != '') { ?>
+			<?php if ( get_post_meta( $post->ID, '_listing_school_neighborhood', true ) != '' ) { ?>
 			<div id="listing-school-neighborhood">
 				<p>
-				<?php echo do_shortcode(get_post_meta( $post->ID, '_listing_school_neighborhood', true)); ?>
+				<?php echo do_shortcode( get_post_meta( $post->ID, '_listing_school_neighborhood', true ) ); ?>
 				</p>
 			</div><!-- #listing-school-neighborhood -->
 			<?php } ?>
@@ -222,22 +234,21 @@ function single_listing_post_content() {
 		</div><!-- #listing-tabs.listing-data -->
 
 		<?php
-			if (get_post_meta( $post->ID, '_listing_map', true) != '') {
-				echo '<div id="listing-map"><h3>Location Map</h3>';
-				echo do_shortcode(get_post_meta( $post->ID, '_listing_map', true) );
-				echo '</div><!-- .listing-map -->';
-			}
-			elseif(get_post_meta( $post->ID, '_listing_latitude', true) && get_post_meta( $post->ID, '_listing_longitude', true) && get_post_meta( $post->ID, '_listing_automap', true) == 'y') {
+		if ( get_post_meta( $post->ID, '_listing_map', true ) != '' ) {
+			echo '<div id="listing-map"><h3>Location Map</h3>';
+			echo do_shortcode( get_post_meta( $post->ID, '_listing_map', true ) );
+			echo '</div><!-- .listing-map -->';
+		} elseif ( get_post_meta( $post->ID, '_listing_latitude', true ) && get_post_meta( $post->ID, '_listing_longitude', true ) && get_post_meta( $post->ID, '_listing_automap', true ) == 'y' ) {
 
-				$map_info_content = sprintf('<p style="font-size: 14px; margin-bottom: 0;">%s<br />%s %s, %s</p>', get_post_meta( $post->ID, '_listing_address', true), get_post_meta( $post->ID, '_listing_city', true), get_post_meta( $post->ID, '_listing_state', true), get_post_meta( $post->ID, '_listing_zip', true));
+			$map_info_content = sprintf( '<p style="font-size: 14px; margin-bottom: 0;">%s<br />%s %s, %s</p>', get_post_meta( $post->ID, '_listing_address', true ), get_post_meta( $post->ID, '_listing_city', true ), get_post_meta( $post->ID, '_listing_state', true ), get_post_meta( $post->ID, '_listing_zip', true ) );
 
-				($options['wp_listings_gmaps_api_key']) ? $map_key = $options['wp_listings_gmaps_api_key'] : $map_key = '';
+			( $options['wp_listings_gmaps_api_key'] ) ? $map_key = $options['wp_listings_gmaps_api_key'] : $map_key = '';
 
-				echo '<script src="https://maps.googleapis.com/maps/api/js?key=' . $map_key . '"></script>
+			echo '<script src="https://maps.googleapis.com/maps/api/js?key=' . $map_key . '"></script>
 				<script>
 					function initialize() {
 						var mapCanvas = document.getElementById(\'map-canvas\');
-						var myLatLng = new google.maps.LatLng(' . get_post_meta( $post->ID, '_listing_latitude', true) . ', ' . get_post_meta( $post->ID, '_listing_longitude', true) . ')
+						var myLatLng = new google.maps.LatLng(' . get_post_meta( $post->ID, '_listing_latitude', true ) . ', ' . get_post_meta( $post->ID, '_listing_longitude', true ) . ')
 						var mapOptions = {
 							center: myLatLng,
 							zoom: 14,
@@ -264,177 +275,189 @@ function initialize() {
 					google.maps.event.addDomListener(window, \'load\', initialize);
 				</script>
 				';
-				echo '<div id="listing-map"><h3>Location Map</h3><div id="map-canvas" style="width: 100%; height: 350px;"></div></div><!-- .listing-map -->';
-			}
+			echo '<div id="listing-map"><h3>Location Map</h3><div id="map-canvas" style="width: 100%; height: 350px;"></div></div><!-- .listing-map -->';
+		}
 		?>
 
 		<?php
-			if (function_exists('_p2p_init') && function_exists('agent_profiles_init') ) {
-				if(impa_has_listings($post->ID)) {
-					echo'<div id="listing-agent">
+		if ( function_exists( '_p2p_init' ) && function_exists( 'agent_profiles_init' ) ) {
+			if ( impa_has_listings( $post->ID ) ) {
+				echo '<div id="listing-agent">
 					<div class="connected-agents">';
-					aeprofiles_connected_agents_markup();
-					echo '</div></div><!-- .listing-agent -->';
-				}
-			} elseif (function_exists('_p2p_init') && function_exists('impress_agents_init') ) {
-				if(impa_has_listings($post->ID)) {
-					echo'<div id="listing-agent">
+				aeprofiles_connected_agents_markup();
+				echo '</div></div><!-- .listing-agent -->';
+			}
+		} elseif ( function_exists( '_p2p_init' ) && function_exists( 'impress_agents_init' ) ) {
+			if ( impa_has_listings( $post->ID ) ) {
+				echo '<div id="listing-agent">
 					<div class="connected-agents">';
-					impa_connected_agents_markup();
-					echo '</div></div><!-- .listing-agent -->';
-				}
+				impa_connected_agents_markup();
+				echo '</div></div><!-- .listing-agent -->';
 			}
+		}
 		?>
 
 		<div id="listing-contact">
 
 			<?php
 
-			if (get_post_meta( $post->ID, '_listing_contact_form', true) != '') {
+			if ( get_post_meta( $post->ID, '_listing_contact_form', true ) != '' ) {
 
-				echo do_shortcode(get_post_meta( $post->ID, '_listing_contact_form', true) );
+				echo do_shortcode( get_post_meta( $post->ID, '_listing_contact_form', true ) );
 
-			} elseif (isset($options['wp_listings_default_form']) && $options['wp_listings_default_form'] != '') {
+			} elseif ( isset( $options['wp_listings_default_form'] ) && $options['wp_listings_default_form'] != '' ) {
 
-				echo do_shortcode($options['wp_listings_default_form']);
+				echo do_shortcode( $options['wp_listings_default_form'] );
 
 			} else {
 
 				echo '<h4>Listing Inquiry</h4>';
 				$firstNameError = '';
-				$lastNameError = '';
-				$emailError = '';
-				$response = '';
+				$lastNameError  = '';
+				$emailError     = '';
+				$response       = '';
 
-				if(isset($_POST['submitted'])) {
+				if ( isset( $_POST['submitted'] ) ) {
 
-					$url = get_permalink();
+					$url     = get_permalink();
 					$listing = get_the_title();
 
-					if(trim($_POST['firstName']) === '') {
+					if ( trim( $_POST['firstName'] ) === '' ) {
 						$firstNameError = 'Please enter your first name.';
-						$hasError = true;
+						$hasError       = true;
 					} else {
-						$firstName = esc_html(trim($_POST['firstName']));
+						$firstName = esc_html( trim( $_POST['firstName'] ) );
 					}
 
-					if(trim($_POST['lastName']) === '') {
+					if ( trim( $_POST['lastName'] ) === '' ) {
 						$lastNameError = 'Please enter your last name.';
-						$hasError = true;
+						$hasError      = true;
 					} else {
-						$lastName = esc_html(trim($_POST['lastName']));
+						$lastName = esc_html( trim( $_POST['lastName'] ) );
 					}
 
-					if(trim($_POST['email']) === '')  {
+					if ( trim( $_POST['email'] ) === '' ) {
 						$emailError = 'Please enter your email address.';
-						$hasError = true;
-					} else if (!is_email(trim($_POST['email']))) {
+						$hasError   = true;
+					} elseif ( ! is_email( trim( $_POST['email'] ) ) ) {
 						$emailError = 'You entered an invalid email address.';
-						$hasError = true;
+						$hasError   = true;
 					} else {
-						$email = esc_html(trim($_POST['email']));
+						$email = esc_html( trim( $_POST['email'] ) );
 					}
 
-					$phone = esc_html(trim($_POST['phone']));
+					$phone = esc_html( trim( $_POST['phone'] ) );
 
-					if(function_exists('stripslashes')) {
-						$comments = esc_html(stripslashes(trim($_POST['comments'])));
+					if ( function_exists( 'stripslashes' ) ) {
+						$comments = esc_html( stripslashes( trim( $_POST['comments'] ) ) );
 					} else {
-						$comments = esc_html(trim($_POST['comments']));
+						$comments = esc_html( trim( $_POST['comments'] ) );
 					}
 
-					if($options['wp_listings_captcha_site_key'] != '' && $options['wp_listings_captcha_secret_key'] != '') {
-						require_once( WP_LISTINGS_DIR . '/includes/recaptcha.php' );
+					if ( $options['wp_listings_captcha_site_key'] != '' && $options['wp_listings_captcha_secret_key'] != '' ) {
+						require_once WP_LISTINGS_DIR . '/includes/recaptcha.php';
 
 						// your secret key
 						$secret = $options['wp_listings_captcha_secret_key'];
 
-						$gRecaptchaResponse = $_POST["g-recaptcha-response"];
-						$remoteIp = $_SERVER["REMOTE_ADDR"];
+						$gRecaptchaResponse = $_POST['g-recaptcha-response'];
+						$remoteIp           = $_SERVER['REMOTE_ADDR'];
 
-						$recaptcha = new \ReCaptcha\ReCaptcha($secret);
-						$resp = $recaptcha->verify($gRecaptchaResponse, $remoteIp);
-						if ($resp->isSuccess()) {
-						    // verified!
-						    $emailSent = true;
+						$recaptcha = new \ReCaptcha\ReCaptcha( $secret );
+						$resp      = $recaptcha->verify( $gRecaptchaResponse, $remoteIp );
+						if ( $resp->isSuccess() ) {
+							// verified!
+							$emailSent = true;
 						} else {
-						    $errors = $resp->getErrorCodes();
-						    $emailSent = true;
+							$errors    = $resp->getErrorCodes();
+							$emailSent = true;
 						}
 					}
 
-					if(isset($_POST['antispam']) && $_POST['antispam'] == '' || $resp != null && $resp->isSuccess()) {
-						if(!isset($hasError)) {
+					if ( isset( $_POST['antispam'] ) && $_POST['antispam'] == '' || $resp != null && $resp->isSuccess() ) {
+						if ( ! isset( $hasError ) ) {
 							$emailTo = get_the_author_meta( 'user_email', $post->post_author );
-							if (!isset($emailTo) || ($emailTo == '') ){
-								$emailTo = get_option('admin_email');
+							if ( ! isset( $emailTo ) || ( $emailTo == '' ) ) {
+								$emailTo = get_option( 'admin_email' );
 							}
-							$subject = 'Listing Inquiry from '. $firstName . ' ' . $lastName;
-							$body = 'Name: ' . $firstName . ' ' . $lastName . "\n\n" .'Email: ' . $email . "\n\n" . 'Phone: ' . $phone . "\n\n" . 'Listing: ' . $listing . "\n\n" . 'URL: ' . $url . "\n\n" .'Comments: ' . $comments;
-							$headers = 'From: '.$firstName . ' ' . $lastName .' <'.$emailTo.'>' . "\r\n" . 'Reply-To: ' . $email;
+							$subject = 'Listing Inquiry from ' . $firstName . ' ' . $lastName;
+							$body    = 'Name: ' . $firstName . ' ' . $lastName . "\n\n" . 'Email: ' . $email . "\n\n" . 'Phone: ' . $phone . "\n\n" . 'Listing: ' . $listing . "\n\n" . 'URL: ' . $url . "\n\n" . 'Comments: ' . $comments;
+							$headers = 'From: ' . $firstName . ' ' . $lastName . ' <' . $emailTo . '>' . "\r\n" . 'Reply-To: ' . $email;
 
-							wp_mail($emailTo, $subject, $body, $headers);
+							wp_mail( $emailTo, $subject, $body, $headers );
 
 							// If option is set. PUT or POST contact form data to IDX as a lead or lead note
-							if($options['wp_listings_idx_lead_form'] == 1) {
+							if ( $options['wp_listings_idx_lead_form'] == 1 ) {
 								$lead_data = array(
 									'firstName' => $firstName,
 									'lastName'  => $lastName,
-									'email'		=> $email,
-									'phone'		=> (isset($phone)) ? $phone : ''
+									'email'     => $email,
+									'phone'     => ( isset( $phone ) ) ? $phone : '',
 								);
-								$api_url = 'https://api.idxbroker.com/leads/lead';
-								$args = array(
-									'method' => 'PUT',
-									'headers' => array(
+								$api_url   = 'https://api.idxbroker.com/leads/lead';
+								$args      = array(
+									'method'    => 'PUT',
+									'headers'   => array(
 										'content-type' => 'application/x-www-form-urlencoded',
-										'accesskey'    => get_option('idx_broker_apikey'),
-										'outputtype'   => 'json'
+										'accesskey'    => get_option( 'idx_broker_apikey' ),
+										'outputtype'   => 'json',
 									),
 									'sslverify' => false,
-									'body'		=> http_build_query($lead_data)
+									'body'      => http_build_query( $lead_data ),
 								);
-								$response = wp_remote_request($api_url, $args);
+								$response  = wp_remote_request( $api_url, $args );
 
 								// Check for error then add note
-								if (is_wp_error($response)) {
+								if ( is_wp_error( $response ) ) {
 									$hasError = true;
 								} else {
 
-									$decoded_response = json_decode($response['body']);
-									$note = array(
-										'note' => (isset($comments) && $comments != '') ? 'I\'m interested in this listing: <a href="' . $url . '">' . $listing . '</a>' . "\n\n" . 'Comments: ' . $comments : 'I\'m interested in this listing: <a href="' . $url . '">' . $listing . '</a>'
+									$decoded_response = json_decode( $response['body'] );
+									$note             = array(
+										'note' => ( isset( $comments ) && $comments != '' ) ? 'I\'m interested in this listing: <a href="' . $url . '">' . $listing . '</a>' . "\n\n" . 'Comments: ' . $comments : 'I\'m interested in this listing: <a href="' . $url . '">' . $listing . '</a>',
 									);
 
 									// Add note if lead already exists
-									if($decoded_response == 'Lead already exists.') {
-										$args = array_replace($args, array('method' => 'GET', 'body' => null));
+									if ( $decoded_response == 'Lead already exists.' ) {
+										$args = array_replace(
+											$args,
+											array(
+												'method' => 'GET',
+												'body'   => null,
+											)
+										);
 
 										// Get leads
-										if ( false === ( $all_leads = get_transient('idx_leads') ) ) {
-											$response = wp_remote_request($api_url, $args);
-											$all_leads = json_decode($response['body'], 1);
-											set_transient('idx_leads', $all_leads, 60*60*1);
+										if ( false === ( $all_leads = get_transient( 'idx_leads' ) ) ) {
+											$response  = wp_remote_request( $api_url, $args );
+											$all_leads = json_decode( $response['body'], 1 );
+											set_transient( 'idx_leads', $all_leads, 60 * 60 * 1 );
 										}
 
 										// Loop through leads to match email address
-										foreach($all_leads as $leads => $lead) {
-											if($lead['email'] == $email) {
-												$api_url = 'https://api.idxbroker.com/leads/note/' . $lead['id'];
-												$args = array_replace($args, array('method' => 'PUT', 'body' => http_build_query($note)));
-												$response = wp_remote_request($api_url, $args);
-												if (is_wp_error($response)) {
+										foreach ( $all_leads as $leads => $lead ) {
+											if ( $lead['email'] == $email ) {
+												$api_url  = 'https://api.idxbroker.com/leads/note/' . $lead['id'];
+												$args     = array_replace(
+													$args,
+													array(
+														'method' => 'PUT',
+														'body' => http_build_query( $note ),
+													)
+												);
+												$response = wp_remote_request( $api_url, $args );
+												if ( is_wp_error( $response ) ) {
 													$hasError = true;
 												}
 											}
 										}
 									} else {
 										// Add note for new lead
-										$lead_id = $decoded_response->newID;
-										$api_url = 'https://api.idxbroker.com/leads/note/' . $lead_id;
-										$args = array_replace($args, array('body' => http_build_query($note)));
-										$response = wp_remote_request($api_url, $args);
-										if (is_wp_error($response)) {
+										$lead_id  = $decoded_response->newID;
+										$api_url  = 'https://api.idxbroker.com/leads/note/' . $lead_id;
+										$args     = array_replace( $args, array( 'body' => http_build_query( $note ) ) );
+										$response = wp_remote_request( $api_url, $args );
+										if ( is_wp_error( $response ) ) {
 											$hasError = true;
 										}
 									}
@@ -448,13 +471,13 @@ function initialize() {
 				}
 				?>
 
-			<?php if(isset($emailSent) && $emailSent == true) {	?>
+				<?php if ( isset( $emailSent ) && $emailSent == true ) { ?>
 				<div class="thanks">
 					<a name="redirectTo"></a>
 					<p>Thanks, your message was sent! We'll be in touch shortly.</p>
 				</div>
 			<?php } else { ?>
-				<?php if(isset($hasError)) { ?>
+				<?php if ( isset( $hasError ) ) { ?>
 					<a name="redirectTo"></a>
 					<label class="error" name="redirectTo">Sorry, an error occured. Please try again.<label>
 				<?php } ?>
@@ -463,40 +486,65 @@ function initialize() {
 					<ul class="inquiry-form">
 						<li class="firstName">
 							<label for="firstName">First name: <span class="required">*</span></label>
-							<input type="text" name="firstName" id="firstName" value="<?php if(isset($_POST['firstName'])) echo esc_html($_POST['firstName']);?>" class="required requiredField" />
-							<?php if($firstNameError != '') { ?>
-								<label class="error"><?=$firstNameError;?></label>
+							<input type="text" name="firstName" id="firstName" value="
+							<?php
+							if ( isset( $_POST['firstName'] ) ) {
+								echo esc_html( $_POST['firstName'] );}
+							?>
+							" class="required requiredField" />
+							<?php if ( $firstNameError != '' ) { ?>
+								<label class="error"><?php echo $firstNameError; ?></label>
 							<?php } ?>
 						</li>
 
 						<li class="lastName">
 							<label for="lastName">Last name: <span class="required">*</span></label>
-							<input type="text" name="lastName" id="lastName" value="<?php if(isset($_POST['lastName'])) echo esc_html($_POST['lastName']);?>" class="required requiredField" />
-							<?php if($lastNameError != '') { ?>
-								<label class="error"><?=$lastNameError;?></label>
+							<input type="text" name="lastName" id="lastName" value="
+							<?php
+							if ( isset( $_POST['lastName'] ) ) {
+								echo esc_html( $_POST['lastName'] );}
+							?>
+							" class="required requiredField" />
+							<?php if ( $lastNameError != '' ) { ?>
+								<label class="error"><?php echo $lastNameError; ?></label>
 							<?php } ?>
 						</li>
 
 						<li class="contactEmail">
 							<label for="email">Email: <span class="required">*</span></label>
-							<input type="text" name="email" id="email" value="<?php if(isset($_POST['email']))  echo esc_html($_POST['email']);?>" class="required requiredField email" />
-							<?php if($emailError != '') { ?>
-								<label class="error"><?=$emailError;?></label>
+							<input type="text" name="email" id="email" value="
+							<?php
+							if ( isset( $_POST['email'] ) ) {
+								echo esc_html( $_POST['email'] );}
+							?>
+							" class="required requiredField email" />
+							<?php if ( $emailError != '' ) { ?>
+								<label class="error"><?php echo $emailError; ?></label>
 							<?php } ?>
 						</li>
 
 						<li class="contactPhone">
 							<label for="phone">Phone:</label>
-							<input type="text" name="phone" id="phone" value="<?php if(isset($_POST['phone']))  echo esc_html($_POST['phone']);?>" />
+							<input type="text" name="phone" id="phone" value="
+							<?php
+							if ( isset( $_POST['phone'] ) ) {
+								echo esc_html( $_POST['phone'] );}
+							?>
+							" />
 						</li>
 
 						<li class="contactComments"><label for="commentsText">Message:</label>
-							<textarea name="comments" id="commentsText" rows="6" cols="20"><?php if(isset($_POST['comments'])) echo esc_html($_POST['comments']); ?></textarea>
+							<textarea name="comments" id="commentsText" rows="6" cols="20">
+							<?php
+							if ( isset( $_POST['comments'] ) ) {
+								echo esc_html( $_POST['comments'] );}
+							?>
+							</textarea>
 						</li>
 
 						<?php
-						if($options['wp_listings_captcha_site_key'] != '' && $options['wp_listings_captcha_secret_key'] != '') {
-							echo '<div class="g-recaptcha" data-sitekey="'. $options['wp_listings_captcha_site_key'] .'"></div>';
+						if ( $options['wp_listings_captcha_site_key'] != '' && $options['wp_listings_captcha_secret_key'] != '' ) {
+							echo '<div class="g-recaptcha" data-sitekey="' . $options['wp_listings_captcha_site_key'] . '"></div>';
 							echo '<script src="https://www.google.com/recaptcha/api.js"></script>';
 						} else {
 							echo '<li>
@@ -511,18 +559,18 @@ function initialize() {
 					</ul>
 					<input type="hidden" name="submitted" id="submitted" value="true" />
 				</form>
-			<?php }
-
+			<?php
+}
 			}
 			?>
 		</div><!-- .listing-contact -->
 
 	</div><!-- .entry-content -->
 
-<?php
+	<?php
 }
 
-if (function_exists('equity')) {
+if ( function_exists( 'equity' ) ) {
 
 	remove_action( 'equity_entry_header', 'equity_post_info', 12 );
 	remove_action( 'equity_entry_footer', 'equity_post_meta' );
@@ -532,7 +580,7 @@ function initialize() {
 
 	equity();
 
-} elseif (function_exists('genesis_init')) {
+} elseif ( function_exists( 'genesis_init' ) ) {
 
 	remove_action( 'genesis_before_loop', 'genesis_do_breadcrumbs' );
 	remove_action( 'genesis_entry_header', 'genesis_post_info', 12 ); // HTML5
@@ -551,10 +599,10 @@ function initialize() {
 
 } else {
 
-	$options = get_option('plugin_wp_listings_settings');
+	$options = get_option( 'plugin_wp_listings_settings' );
 
 	get_header();
-	if(isset($options['wp_listings_custom_wrapper']) && isset($options['wp_listings_start_wrapper']) && $options['wp_listings_start_wrapper'] != '') {
+	if ( isset( $options['wp_listings_custom_wrapper'] ) && isset( $options['wp_listings_start_wrapper'] ) && $options['wp_listings_start_wrapper'] != '' ) {
 		echo $options['wp_listings_start_wrapper'];
 	} else {
 		echo '<div id="primary" class="content-area container inner">
@@ -562,21 +610,28 @@ function initialize() {
 	}
 
 		// Start the Loop.
-		while ( have_posts() ) : the_post(); ?>
+	while ( have_posts() ) :
+		the_post();
+		?>
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 			<header class="entry-header">
 				<?php the_title( '<h1 class="entry-title" itemprop="name">', '</h1>' ); ?>
-				<small><?php if ( function_exists('yoast_breadcrumb') ) { yoast_breadcrumb('<p id="breadcrumbs">','</p>'); } ?></small>
+				<small>
+				<?php
+				if ( function_exists( 'yoast_breadcrumb' ) ) {
+					yoast_breadcrumb( '<p id="breadcrumbs">', '</p>' ); }
+				?>
+				</small>
 				<div class="entry-meta">
 					<?php
-						if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
-					?>
+					if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+						?>
 					<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wp-listings' ), __( '1 Comment', 'wp-listings' ), __( '% Comments', 'wp-listings' ) ); ?></span>
-					<?php
+						<?php
 						endif;
 
-						edit_post_link( __( 'Edit', 'wp-listings' ), '<span class="edit-link">', '</span>' );
+					edit_post_link( __( 'Edit', 'wp-listings' ), '<span class="edit-link">', '</span>' );
 					?>
 				</div><!-- .entry-meta -->
 			</header><!-- .entry-header -->
@@ -586,7 +641,7 @@ function initialize() {
 
 		</article><!-- #post-ID -->
 
-	<?php
+		<?php
 		// Previous/next post navigation.
 		wp_listings_post_nav();
 
@@ -596,7 +651,7 @@ function initialize() {
 		}
 		endwhile;
 
-	if(isset($options['wp_listings_custom_wrapper']) && isset($options['wp_listings_end_wrapper']) && $options['wp_listings_end_wrapper'] != '') {
+	if ( isset( $options['wp_listings_custom_wrapper'] ) && isset( $options['wp_listings_end_wrapper'] ) && $options['wp_listings_end_wrapper'] != '' ) {
 		echo $options['wp_listings_end_wrapper'];
 	} else {
 		echo '</div><!-- #content -->
diff --git a/includes/views/wp-listings-settings.php b/includes/views/wp-listings-settings.php
index 8113625..43fe11e 100755
--- a/includes/views/wp-listings-settings.php
+++ b/includes/views/wp-listings-settings.php
@@ -1,103 +1,107 @@
 <?php
-if ( !class_exists( 'Idx_Broker_Plugin' ) ) {
+if ( ! class_exists( 'Idx_Broker_Plugin' ) ) {
 	echo wp_listings_admin_notice( __( '<strong>Integrate your MLS Listings into WordPress with IDX Broker!</strong> <a href="http://www.idxbroker.com/features/idx-wordpress-plugin">Find out how</a>', 'wp-listings' ), false, 'activate_plugins', 'wpl_notice_idx' );
 }
-if( !function_exists( 'equity' ) ) {
+if ( ! function_exists( 'equity' ) ) {
 	echo wp_listings_admin_notice( __( '<strong>Want enhanced listings? Automatically import extra details and photos with Equity.</strong> <a href="http://www.agentevolution.com/equity/">Learn how</a>', 'wp-listings' ), false, 'activate_plugins', 'wpl_notice_equity' );
 }
 
-if( isset($_GET['settings-updated']) ) { ?>
+if ( isset( $_GET['settings-updated'] ) ) { ?>
 	<div id="message" class="updated">
-		<p><strong><?php _e('Settings saved.', 'wp-listings'); ?></strong></p>
+		<p><strong><?php _e( 'Settings saved.', 'wp-listings' ); ?></strong></p>
 	</div>
-<?php
+	<?php
 }
 
 ?>
 <div id="icon-options-general" class="icon32"></div>
 <div class="wrap">
-	<h1><?php _e('IMPress Listings Settings', 'wp-listings'); ?></h1>
+	<h1><?php _e( 'IMPress Listings Settings', 'wp-listings' ); ?></h1>
 	<hr>
 	<div id="poststuff" class="metabox-holder has-right-sidebar">
 		<div id="side-info-column" class="inner-sidebar">
-		<?php do_meta_boxes('wp-listings-options', 'side', null); ?>
+		<?php do_meta_boxes( 'wp-listings-options', 'side', null ); ?>
 		</div>
 
 		<div id="post-body">
 			<div id="post-body-content" class="has-sidebar-content">
 			<script>
 			  jQuery( function() {
-			    jQuery( "#post-body-content" ).tabs();
+				jQuery( "#post-body-content" ).tabs();
 			  } );
 			</script>
 			<ul>
 				<li><a href="#tab-general">General</a></li>
-				<?php if(class_exists( 'Idx_Broker_Plugin' )) { echo '<li><a href="#tab-idx">IDX</a></li>'; } ?>
+				<?php
+				if ( class_exists( 'Idx_Broker_Plugin' ) ) {
+					echo '<li><a href="#tab-idx">IDX</a></li>'; }
+				?>
 				<li><a href="#tab-advanced">Advanced</a></li>
 			</ul>
 
-				<?php $options = get_option('plugin_wp_listings_settings');
+				<?php
+				$options = get_option( 'plugin_wp_listings_settings' );
 
 				$defaults = array(
-					'wp_listings_stylesheet_load'			=> 0,
-					'wp_listings_widgets_stylesheet_load'	=> 0,
-					'wp_listings_default_state'				=> '',
-					'wp_listings_currency_symbol'			=> '',
-					'wp_listings_currency_code'				=> '',
-					'wp_listings_display_currency_code'		=> 0,
-					'wp_listings_archive_posts_num'			=> 9,
-					'wp_listings_global_disclaimer'			=> '',
-					'wp_listings_slug'						=> 'listings',
-					'wp_listings_gmaps_api_key'				=> '',
-					'wp_listings_captcha_site_key'			=> '',
-					'wp_listings_captcha_secret_key'		=> '',
-					'wp_listings_default_form'				=> '',
-					'wp_listings_custom_wrapper'			=> 0,
-					'wp_listings_start_wrapper'				=> '',
-					'wp_listings_end_wrapper'				=> '',
-					'wp_listings_idx_lead_form'				=> 1,
-					'wp_listings_idx_update'				=> 'update-all',
-					'wp_listings_idx_sold'					=> 'sold-keep',
-					'wp_listings_auto_import'				=> 0,
-					'wp_listings_default_template'			=> '',
-					'wp_listings_display_idx_link'			=> 0,
-					'wp_listings_import_author'				=> 0,
-					'wp_listings_import_title'				=> '{{address}}',
-					'wp_listings_uninstall_delete'			=> 0
-					);
-
-				foreach($defaults as $name => $value) {
-					if ( !isset($options[$name]) ) {
-						$options[$name] = $value;
+					'wp_listings_stylesheet_load'         => 0,
+					'wp_listings_widgets_stylesheet_load' => 0,
+					'wp_listings_default_state'           => '',
+					'wp_listings_currency_symbol'         => '',
+					'wp_listings_currency_code'           => '',
+					'wp_listings_display_currency_code'   => 0,
+					'wp_listings_archive_posts_num'       => 9,
+					'wp_listings_global_disclaimer'       => '',
+					'wp_listings_slug'                    => 'listings',
+					'wp_listings_gmaps_api_key'           => '',
+					'wp_listings_captcha_site_key'        => '',
+					'wp_listings_captcha_secret_key'      => '',
+					'wp_listings_default_form'            => '',
+					'wp_listings_custom_wrapper'          => 0,
+					'wp_listings_start_wrapper'           => '',
+					'wp_listings_end_wrapper'             => '',
+					'wp_listings_idx_lead_form'           => 1,
+					'wp_listings_idx_update'              => 'update-all',
+					'wp_listings_idx_sold'                => 'sold-keep',
+					'wp_listings_auto_import'             => 0,
+					'wp_listings_default_template'        => '',
+					'wp_listings_display_idx_link'        => 0,
+					'wp_listings_import_author'           => 0,
+					'wp_listings_import_title'            => '{{address}}',
+					'wp_listings_uninstall_delete'        => 0,
+				);
+
+				foreach ( $defaults as $name => $value ) {
+					if ( ! isset( $options[ $name ] ) ) {
+						$options[ $name ] = $value;
 					}
 				}
 
 				?>
 
 				<form action="options.php" method="post" id="wp-listings-settings-options-form">
-					<input name="submit" class="button-primary" type="submit" value="<?php esc_attr_e('Save Settings'); ?>" style="float: right; margin: -32px 10px 0 0;" />
+					<input name="submit" class="button-primary" type="submit" value="<?php esc_attr_e( 'Save Settings' ); ?>" style="float: right; margin: -32px 10px 0 0;" />
 					<?php
-					settings_fields('wp_listings_options');
+					settings_fields( 'wp_listings_options' );
 					echo '<div id="tab-general">';
 
-					_e("<h3>Default State</h3><p>You can enter a default state that will automatically be output on template pages and widgets that show the state. When you create a listing and leave the state field empty, the default below will be shown. You can override the default on each listing by entering a value into the state field.</p>", 'wp-listings' );
+					_e( '<h3>Default State</h3><p>You can enter a default state that will automatically be output on template pages and widgets that show the state. When you create a listing and leave the state field empty, the default below will be shown. You can override the default on each listing by entering a value into the state field.</p>', 'wp-listings' );
 					echo '<p>Default State: <input name="plugin_wp_listings_settings[wp_listings_default_state]" id="wp_listings_default_state" type="text" value="' . $options['wp_listings_default_state'] . '" size="1" /></p><hr>';
 
-					_e("<h3>Default Currency</h3><p>Select a default currency symbol and optional currency code to display on listings.</p>", 'wp-listings' );
-					_e('<p>Currency Symbol: ', 'wp-listings');
+					_e( '<h3>Default Currency</h3><p>Select a default currency symbol and optional currency code to display on listings.</p>', 'wp-listings' );
+					_e( '<p>Currency Symbol: ', 'wp-listings' );
 					echo '<select name="plugin_wp_listings_settings[wp_listings_currency_symbol]" id="wp_listings_currency_symbol">
-							 <option value=" " ' . selected($options['wp_listings_currency_symbol'], ' ', false) . '>None</option>
-							 <option value="&#36;" ' . selected($options['wp_listings_currency_symbol'], '$', false) . '>&#36;</option>
-							 <option value="&#163;" ' . selected($options['wp_listings_currency_symbol'], '£', false) . '>&#163;</option>
-							 <option value="&#8364;" ' . selected($options['wp_listings_currency_symbol'], '€', false) . '>&#8364;</option>
-							 <option value="&#165;" ' . selected($options['wp_listings_currency_symbol'], '¥', false) . '>&#165;</option>
-							 <option value="&#8369;" ' . selected($options['wp_listings_currency_symbol'], '₱', false) . '>&#8369;</option>
-							 <option value="&#8361;" ' . selected($options['wp_listings_currency_symbol'], '₩', false) . '>&#8361;</option>
-							 <option value="&#402;" ' . selected($options['wp_listings_currency_symbol'], 'ƒ', false) . '>&#402;</option>
-							 <option value="&#8358;" ' . selected($options['wp_listings_currency_symbol'], '₦', false) . '>&#8358;</option>
+							 <option value=" " ' . selected( $options['wp_listings_currency_symbol'], ' ', false ) . '>None</option>
+							 <option value="&#36;" ' . selected( $options['wp_listings_currency_symbol'], '$', false ) . '>&#36;</option>
+							 <option value="&#163;" ' . selected( $options['wp_listings_currency_symbol'], '£', false ) . '>&#163;</option>
+							 <option value="&#8364;" ' . selected( $options['wp_listings_currency_symbol'], '€', false ) . '>&#8364;</option>
+							 <option value="&#165;" ' . selected( $options['wp_listings_currency_symbol'], '¥', false ) . '>&#165;</option>
+							 <option value="&#8369;" ' . selected( $options['wp_listings_currency_symbol'], '₱', false ) . '>&#8369;</option>
+							 <option value="&#8361;" ' . selected( $options['wp_listings_currency_symbol'], '₩', false ) . '>&#8361;</option>
+							 <option value="&#402;" ' . selected( $options['wp_listings_currency_symbol'], 'ƒ', false ) . '>&#402;</option>
+							 <option value="&#8358;" ' . selected( $options['wp_listings_currency_symbol'], '₦', false ) . '>&#8358;</option>
 							</select>
 						  </p>';
-					$codes = array (
+					$codes = array(
 						''    => 'None',
 						'USD' => 'United States dollar',
 						'GBP' => 'British pound',
@@ -258,109 +262,127 @@
 						'YER' => 'Yemeni rial',
 						'ZAR' => 'South African rand',
 						'ZMW' => 'Zambian kwacha',
-						'ZWL' => 'Zimbabwean dollar'
+						'ZWL' => 'Zimbabwean dollar',
 					);
-					_e('<p>Currency Code: ', 'wp-listings');
+					_e( '<p>Currency Code: ', 'wp-listings' );
 					echo '<select name="plugin_wp_listings_settings[wp_listings_currency_code]" id="plugin_wp_listings_settings[wp_listings_currency_code]" data-currency="USD">';
-						foreach ($codes as $code => $currency_name) {
-							echo '<option value=' . $code . ' ' . selected($options['wp_listings_currency_code'], $code, false) . '>' . $currency_name . '</option>';
-						}
+					foreach ( $codes as $code => $currency_name ) {
+						echo '<option value=' . $code . ' ' . selected( $options['wp_listings_currency_code'], $code, false ) . '>' . $currency_name . '</option>';
+					}
 					echo '</select>
 					  </p>';
 
-					_e('<p><input name="plugin_wp_listings_settings[wp_listings_display_currency_code]" id="wp_listings_display_currency_code" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_display_currency_code'], 0 ) . ' /> Display currency code?</p><hr>', 'wp-listings' );
+					_e( '<p><input name="plugin_wp_listings_settings[wp_listings_display_currency_code]" id="wp_listings_display_currency_code" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_display_currency_code'], 0 ) . ' /> Display currency code?</p><hr>', 'wp-listings' );
 
-					_e("<h3>Default Number of Posts</h3><p>The default number of posts displayed on a listing archive page is 9. Here you can set a custom number. Enter <span style='color: #f00;font-weight: 700;'>-1</span> to display all listing posts.<br /><em>If you have more than 20-30 posts, it's not recommended to show all or your page will load slow.</em></p>", 'wp-listings' );
-					_e('<p>Number of posts on listing archive page: <input name="plugin_wp_listings_settings[wp_listings_archive_posts_num]" id="wp_listings_archive_posts_num" type="text" value="' . $options['wp_listings_archive_posts_num'] . '" size="1" /></p><hr>', 'wp-listings' );
+					_e( "<h3>Default Number of Posts</h3><p>The default number of posts displayed on a listing archive page is 9. Here you can set a custom number. Enter <span style='color: #f00;font-weight: 700;'>-1</span> to display all listing posts.<br /><em>If you have more than 20-30 posts, it's not recommended to show all or your page will load slow.</em></p>", 'wp-listings' );
+					_e( '<p>Number of posts on listing archive page: <input name="plugin_wp_listings_settings[wp_listings_archive_posts_num]" id="wp_listings_archive_posts_num" type="text" value="' . $options['wp_listings_archive_posts_num'] . '" size="1" /></p><hr>', 'wp-listings' );
 
-					_e("<h3>Default Disclaimer</h3><p>Optionally enter a disclaimer to show on single listings. This can be overridden on individual listings.</p>", 'wp-listings' );
-					_e('<p><textarea name="plugin_wp_listings_settings[wp_listings_global_disclaimer]" id="wp_listings_global_disclaimer" type="text" value="' . esc_html($options['wp_listings_global_disclaimer']) . '" rows="4" style="width: 80%">' . esc_html($options['wp_listings_global_disclaimer']) . '</textarea></p><hr>', 'wp-listings' );
+					_e( '<h3>Default Disclaimer</h3><p>Optionally enter a disclaimer to show on single listings. This can be overridden on individual listings.</p>', 'wp-listings' );
+					_e( '<p><textarea name="plugin_wp_listings_settings[wp_listings_global_disclaimer]" id="wp_listings_global_disclaimer" type="text" value="' . esc_html( $options['wp_listings_global_disclaimer'] ) . '" rows="4" style="width: 80%">' . esc_html( $options['wp_listings_global_disclaimer'] ) . '</textarea></p><hr>', 'wp-listings' );
 
-					_e('<h3>Listings slug</h3><p>Optionally change the slug of the listing post type<br /><input type="text" name="plugin_wp_listings_settings[wp_listings_slug]" value="' . $options['wp_listings_slug'] . '" /></p>', 'wp-listings' );
-					_e("<em>Don't forget to <a href='../wp-admin/options-permalink.php'>reset your permalinks</a> if you change the slug!</em></p>", 'wp-listings' );
+					_e( '<h3>Listings slug</h3><p>Optionally change the slug of the listing post type<br /><input type="text" name="plugin_wp_listings_settings[wp_listings_slug]" value="' . $options['wp_listings_slug'] . '" /></p>', 'wp-listings' );
+					_e( "<em>Don't forget to <a href='../wp-admin/options-permalink.php'>reset your permalinks</a> if you change the slug!</em></p>", 'wp-listings' );
 					echo '</div><!-- #tab-general -->';
 
 					echo '<div id="tab-advanced">';
 
-					_e('<h3>Include CSS?</h3>', 'wp-listings');
-					if ($options['wp_listings_stylesheet_load'] == 1)
+					_e( '<h3>Include CSS?</h3>', 'wp-listings' );
+					if ( $options['wp_listings_stylesheet_load'] == 1 ) {
 						echo '<p style="color:red; font-weight: bold;">The plugin\'s main stylesheet (wp-listings.css) has been deregistered<p>';
-					if ($options['wp_listings_widgets_stylesheet_load'] == 1)
+					}
+					if ( $options['wp_listings_widgets_stylesheet_load'] == 1 ) {
 						echo '<p style="color:red; font-weight: bold;">The plugin\'s widget stylesheet (wp-listings-widgets.css) has been deregistered<p>';
-					_e('<p>Here you can deregister the WP Listings CSS files and move to your theme\'s css file for ease of customization</p>', 'wp-listings');
-					_e('<p><input name="plugin_wp_listings_settings[wp_listings_stylesheet_load]" id="wp_listings_stylesheet_load" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_stylesheet_load'], false ) . ' /> Deregister WP Listings main CSS (wp-listings.css)?</p>', 'wp-listings' );
+					}
+					_e( '<p>Here you can deregister the WP Listings CSS files and move to your theme\'s css file for ease of customization</p>', 'wp-listings' );
+					_e( '<p><input name="plugin_wp_listings_settings[wp_listings_stylesheet_load]" id="wp_listings_stylesheet_load" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_stylesheet_load'], false ) . ' /> Deregister WP Listings main CSS (wp-listings.css)?</p>', 'wp-listings' );
 
-					_e('<p><input name="plugin_wp_listings_settings[wp_listings_widgets_stylesheet_load]" id="wp_listings_widgets_stylesheet_load" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_widgets_stylesheet_load'], false ) . ' /> Deregister WP Listings widgets CSS (wp-listings-widgets.css)?</p><hr>', 'wp-listings' );
+					_e( '<p><input name="plugin_wp_listings_settings[wp_listings_widgets_stylesheet_load]" id="wp_listings_widgets_stylesheet_load" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_widgets_stylesheet_load'], false ) . ' /> Deregister WP Listings widgets CSS (wp-listings-widgets.css)?</p><hr>', 'wp-listings' );
 
-					_e('<h3>Forms</h3><h4>Google Recaptcha (anti-spam)</h4><p>With the default contact form, you can choose to add Google Recaptcha to prevent spam, or use a form shortcode plugin with anti-spam protection. To use Google Recaptcha, you must first <a href="https://www.google.com/recaptcha/admin" target="_blank">sign up for a key</a>, then enter the site and secret key below:</p>', 'wp-listings' );
-					_e('<p>Site key: <input name="plugin_wp_listings_settings[wp_listings_captcha_site_key]" id="wp_listings_captcha_site_key" type="text" value="' . esc_html($options['wp_listings_captcha_site_key']) . '" size="40" /></p>', 'wp-listings');
-					_e('<p>Secret key: <input name="plugin_wp_listings_settings[wp_listings_captcha_secret_key]" id="wp_listings_captcha_secret_key" type="text" value="' . esc_html($options['wp_listings_captcha_secret_key']) . '" size="40" /></p>', 'wp-listings');
-					_e("<h4>Default Form shortcode</h4><p>If you use a Contact Form plugin, you may enter the form shortcode here to display on all listings. Additionally, each listing can use a custom form. If no shortcode is entered, the template will use a default contact form:</p>", 'wp-listings' );
-					_e('<p>Form shortcode: <input name="plugin_wp_listings_settings[wp_listings_default_form]" id="wp_listings_default_form" type="text" value="' . esc_html($options['wp_listings_default_form']) . '" size="40" /></p>', 'wp-listings');
+					_e( '<h3>Forms</h3><h4>Google Recaptcha (anti-spam)</h4><p>With the default contact form, you can choose to add Google Recaptcha to prevent spam, or use a form shortcode plugin with anti-spam protection. To use Google Recaptcha, you must first <a href="https://www.google.com/recaptcha/admin" target="_blank">sign up for a key</a>, then enter the site and secret key below:</p>', 'wp-listings' );
+					_e( '<p>Site key: <input name="plugin_wp_listings_settings[wp_listings_captcha_site_key]" id="wp_listings_captcha_site_key" type="text" value="' . esc_html( $options['wp_listings_captcha_site_key'] ) . '" size="40" /></p>', 'wp-listings' );
+					_e( '<p>Secret key: <input name="plugin_wp_listings_settings[wp_listings_captcha_secret_key]" id="wp_listings_captcha_secret_key" type="text" value="' . esc_html( $options['wp_listings_captcha_secret_key'] ) . '" size="40" /></p>', 'wp-listings' );
+					_e( '<h4>Default Form shortcode</h4><p>If you use a Contact Form plugin, you may enter the form shortcode here to display on all listings. Additionally, each listing can use a custom form. If no shortcode is entered, the template will use a default contact form:</p>', 'wp-listings' );
+					_e( '<p>Form shortcode: <input name="plugin_wp_listings_settings[wp_listings_default_form]" id="wp_listings_default_form" type="text" value="' . esc_html( $options['wp_listings_default_form'] ) . '" size="40" /></p>', 'wp-listings' );
 
-					if(class_exists( 'Idx_Broker_Plugin' )) {
-						_e("<h4>Add default form entries to IDX Broker?</h4><p>Check this option to enable form entries to be sent to IDX Broker as a lead.<br/><strong>Note: This only works if using the default contact form.</strong></p>", 'wp-listings' );
-						_e('<p><input name="plugin_wp_listings_settings[wp_listings_idx_lead_form]" id="wp_listings_idx_lead_form" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_idx_lead_form'], 0) . ' /> Enable?</p><hr>', 'wp-listings' );
+					if ( class_exists( 'Idx_Broker_Plugin' ) ) {
+						_e( '<h4>Add default form entries to IDX Broker?</h4><p>Check this option to enable form entries to be sent to IDX Broker as a lead.<br/><strong>Note: This only works if using the default contact form.</strong></p>', 'wp-listings' );
+						_e( '<p><input name="plugin_wp_listings_settings[wp_listings_idx_lead_form]" id="wp_listings_idx_lead_form" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_idx_lead_form'], 0 ) . ' /> Enable?</p><hr>', 'wp-listings' );
 					}
 
-					_e('<h3>Maps</h3><h4>Google Maps</h4><p>Listings can be automatically mapped if they have a latitude and longitude. You will need a <a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">Google Maps API key</a> to use this feature. Enter your API key below.</p>', 'wp-listings' );
-					_e('<p>Browser key: <input name="plugin_wp_listings_settings[wp_listings_gmaps_api_key]" id="wp_listings_gmaps_api_key" type="text" value="' . esc_html($options['wp_listings_gmaps_api_key']) . '" size="40" /></p><hr>', 'wp-listings');
+					_e( '<h3>Maps</h3><h4>Google Maps</h4><p>Listings can be automatically mapped if they have a latitude and longitude. You will need a <a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">Google Maps API key</a> to use this feature. Enter your API key below.</p>', 'wp-listings' );
+					_e( '<p>Browser key: <input name="plugin_wp_listings_settings[wp_listings_gmaps_api_key]" id="wp_listings_gmaps_api_key" type="text" value="' . esc_html( $options['wp_listings_gmaps_api_key'] ) . '" size="40" /></p><hr>', 'wp-listings' );
 
-					_e("<h3>Custom Wrapper</h3><p>If your theme's content HTML ID's and Classes are different than the included template, you can enter the HTML of your content wrapper beginning and end:</p>", 'wp-listings' );
-					_e('<p><label><input name="plugin_wp_listings_settings[wp_listings_custom_wrapper]" id="wp_listings_custom_wrapper" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_custom_wrapper'], false ) . ' /> Use Custom Wrapper?</p>', 'wp-listings' );
-					_e('<p><label>Wrapper Start HTML: </p><input name="plugin_wp_listings_settings[wp_listings_start_wrapper]" id="wp_listings_start_wrapper" type="text" value="' . esc_html($options['wp_listings_start_wrapper']) . '" size="80" /></label>', 'wp-listings' );
-					_e('<p><label>Wrapper End HTML: </p><input name="plugin_wp_listings_settings[wp_listings_end_wrapper]" id="wp_listings_end_wrapper" type="text" value="' . esc_html($options['wp_listings_end_wrapper']) . '" size="80" /></label><hr>', 'wp-listings' );
+					_e( "<h3>Custom Wrapper</h3><p>If your theme's content HTML ID's and Classes are different than the included template, you can enter the HTML of your content wrapper beginning and end:</p>", 'wp-listings' );
+					_e( '<p><label><input name="plugin_wp_listings_settings[wp_listings_custom_wrapper]" id="wp_listings_custom_wrapper" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_custom_wrapper'], false ) . ' /> Use Custom Wrapper?</p>', 'wp-listings' );
+					_e( '<p><label>Wrapper Start HTML: </p><input name="plugin_wp_listings_settings[wp_listings_start_wrapper]" id="wp_listings_start_wrapper" type="text" value="' . esc_html( $options['wp_listings_start_wrapper'] ) . '" size="80" /></label>', 'wp-listings' );
+					_e( '<p><label>Wrapper End HTML: </p><input name="plugin_wp_listings_settings[wp_listings_end_wrapper]" id="wp_listings_end_wrapper" type="text" value="' . esc_html( $options['wp_listings_end_wrapper'] ) . '" size="80" /></label><hr>', 'wp-listings' );
 
-					_e('<h3>Delete data on uninstall?</h3>', 'wp-listings');
-					_e('<p>Checking this option will delete <strong>all</strong> plugin data when uninstalling the plugin.</p>', 'wp-listings');
-					_e('<p><input name="plugin_wp_listings_settings[wp_listings_uninstall_delete]" id="wp_listings_uninstall_delete" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_uninstall_delete'], false ) . ' /> <strong style="color: red;">Delete plugin data on uninstall</strong></p>', 'wp-listings' );
+					_e( '<h3>Delete data on uninstall?</h3>', 'wp-listings' );
+					_e( '<p>Checking this option will delete <strong>all</strong> plugin data when uninstalling the plugin.</p>', 'wp-listings' );
+					_e( '<p><input name="plugin_wp_listings_settings[wp_listings_uninstall_delete]" id="wp_listings_uninstall_delete" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_uninstall_delete'], false ) . ' /> <strong style="color: red;">Delete plugin data on uninstall</strong></p>', 'wp-listings' );
 
 					echo '</div><!-- #tab-advanced -->';
 
-					if(class_exists( 'Idx_Broker_Plugin' )) {
+					if ( class_exists( 'Idx_Broker_Plugin' ) ) {
 						echo '<div id="tab-idx">';
-						_e("<h3>IDX Imported Listings</h3><p>These settings apply to any imported IDX listings. Imported listings are updated via the latest API response twice daily.</p>", 'wp-listings' );
-						_e("<h2>Update Listings</h2>", 'wp-listings' );
-						_e('<div class="idx-import-option update-all"><label><h4>Update All</h4> <span class="dashicons dashicons-update"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-all" class="code" ' . checked('update-all', $options['wp_listings_idx_update'], false ) . ' /> <p>Update all imported fields including gallery and featured image. <br /><em>* Excludes Post Title and Post Content</em></p></label></div>', 'wp-listings' );
-						_e('<div class="idx-import-option update-noimage"><label><h4>Update Excluding Images</h4> <span class="dashicons dashicons-update"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-noimage" class="code" ' . checked('update-noimage', $options['wp_listings_idx_update'], false ) . ' /> <p>Update all imported fields, but excluding the gallery and featured image.<br /><em>* Also excludes Post Title and Post Content</em></p></label></div>', 'wp-listings' );
-						_e('<div class="idx-import-option update-none"><label><h4>Do Not Update</h4> <span class="dashicons dashicons-dismiss"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-none" class="code" ' . checked('update-none', $options['wp_listings_idx_update'], false ) . ' /> <p><strong>Not recommended as displaying inaccurate MLS data may violate your IDX agreement.</strong><br /> Does not update any fields.<br /><em>* Listing will be changed to sold status if it exists in the sold data feed.</em></p></label></div>', 'wp-listings' );
-
-						_e("<br style=\"clear: both;\"><h2>Sold Listings</h2>", 'wp-listings' );
-						_e('<div class="idx-import-option sold-keep"><label><h4>Keep All</h4> <span class="dashicons dashicons-admin-post"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-keep" class="code" ' . checked('sold-keep', $options['wp_listings_idx_sold'], false ) . ' /> <p>This will keep all imported listings published with the status changed to reflect as sold.</p></label></div>', 'wp-listings' );
-						_e('<div class="idx-import-option sold-draft"><label><h4>Keep as Draft</h4> <span class="dashicons dashicons-hidden"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-draft" class="code" ' . checked('sold-draft', $options['wp_listings_idx_sold'], false ) . ' /> <p>This will keep all imported listings that have been sold, but they will be changed to draft status in WordPress.</p></label></div>', 'wp-listings' );
-						_e('<div class="idx-import-option sold-delete"><label><h4>Delete Sold</h4> <span class="dashicons dashicons-trash"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-delete" class="code" ' . checked('sold-delete', $options['wp_listings_idx_sold'], false ) . ' /> <p><strong>Not recommended</strong> <br />This will delete all sold listings and attached featured images from your WordPress database and media library.</p></label></div>', 'wp-listings' );
-
-						_e("<hr style=\"margin: 25px 0; clear: both;\"><h2>Additional Import Options</h2>", 'wp-listings' );
-						_e('<p><input name="plugin_wp_listings_settings[wp_listings_auto_import]" id="wp_listings_auto_import" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_auto_import'], false ) . ' /> Automatically import new listings?</p>', 'wp-listings' );
-
-						_e('<p>Optionally select a default single listing template to use for imported listings.<br />
-							<select name="plugin_wp_listings_settings[wp_listings_default_template]" id="listing_template" class="dropdown">');
-						_e('<option value="">Default</option>', 'wp-listings');
-						
+						_e( '<h3>IDX Imported Listings</h3><p>These settings apply to any imported IDX listings. Imported listings are updated via the latest API response twice daily.</p>', 'wp-listings' );
+						_e( '<h2>Update Listings</h2>', 'wp-listings' );
+						_e( '<div class="idx-import-option update-all"><label><h4>Update All</h4> <span class="dashicons dashicons-update"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-all" class="code" ' . checked( 'update-all', $options['wp_listings_idx_update'], false ) . ' /> <p>Update all imported fields including gallery and featured image. <br /><em>* Excludes Post Title and Post Content</em></p></label></div>', 'wp-listings' );
+						_e( '<div class="idx-import-option update-noimage"><label><h4>Update Excluding Images</h4> <span class="dashicons dashicons-update"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-noimage" class="code" ' . checked( 'update-noimage', $options['wp_listings_idx_update'], false ) . ' /> <p>Update all imported fields, but excluding the gallery and featured image.<br /><em>* Also excludes Post Title and Post Content</em></p></label></div>', 'wp-listings' );
+						_e( '<div class="idx-import-option update-none"><label><h4>Do Not Update</h4> <span class="dashicons dashicons-dismiss"></span><input name="plugin_wp_listings_settings[wp_listings_idx_update]" id="wp_listings_idx_update" type="radio" value="update-none" class="code" ' . checked( 'update-none', $options['wp_listings_idx_update'], false ) . ' /> <p><strong>Not recommended as displaying inaccurate MLS data may violate your IDX agreement.</strong><br /> Does not update any fields.<br /><em>* Listing will be changed to sold status if it exists in the sold data feed.</em></p></label></div>', 'wp-listings' );
+
+						_e( '<br style="clear: both;"><h2>Sold Listings</h2>', 'wp-listings' );
+						_e( '<div class="idx-import-option sold-keep"><label><h4>Keep All</h4> <span class="dashicons dashicons-admin-post"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-keep" class="code" ' . checked( 'sold-keep', $options['wp_listings_idx_sold'], false ) . ' /> <p>This will keep all imported listings published with the status changed to reflect as sold.</p></label></div>', 'wp-listings' );
+						_e( '<div class="idx-import-option sold-draft"><label><h4>Keep as Draft</h4> <span class="dashicons dashicons-hidden"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-draft" class="code" ' . checked( 'sold-draft', $options['wp_listings_idx_sold'], false ) . ' /> <p>This will keep all imported listings that have been sold, but they will be changed to draft status in WordPress.</p></label></div>', 'wp-listings' );
+						_e( '<div class="idx-import-option sold-delete"><label><h4>Delete Sold</h4> <span class="dashicons dashicons-trash"></span><input name="plugin_wp_listings_settings[wp_listings_idx_sold]" id="wp_listings_idx_sold" type="radio" value="sold-delete" class="code" ' . checked( 'sold-delete', $options['wp_listings_idx_sold'], false ) . ' /> <p><strong>Not recommended</strong> <br />This will delete all sold listings and attached featured images from your WordPress database and media library.</p></label></div>', 'wp-listings' );
+
+						_e( '<hr style="margin: 25px 0; clear: both;"><h2>Additional Import Options</h2>', 'wp-listings' );
+						_e( '<p><input name="plugin_wp_listings_settings[wp_listings_auto_import]" id="wp_listings_auto_import" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_auto_import'], false ) . ' /> Automatically import new listings?</p>', 'wp-listings' );
+
+						_e(
+							'<p>Optionally select a default single listing template to use for imported listings.<br />
+							<select name="plugin_wp_listings_settings[wp_listings_default_template]" id="listing_template" class="dropdown">'
+						);
+						_e( '<option value="">Default</option>', 'wp-listings' );
+
 						$listing_templates = Single_Listing_Template::get_listing_templates();
 						/** Loop through templates, make them options */
 						foreach ( (array) $listing_templates as $template_file => $template_name ) {
 							$selected = ( $template_file == $options['wp_listings_default_template'] ) ? ' selected="selected"' : '';
-							$opt = '<option value="' . esc_attr( $template_file ) . '"' . $selected . '>' . esc_html( $template_name ) . '</option>';
+							$opt      = '<option value="' . esc_attr( $template_file ) . '"' . $selected . '>' . esc_html( $template_name ) . '</option>';
 							echo $opt;
 						}
-						
-						_e('</select>');
-
-						_e('<p>Select an author to use when importing listings <br />' . wp_dropdown_users(array('selected' => $options['wp_listings_import_author'], 'name' => 'plugin_wp_listings_settings[wp_listings_import_author]', 'id' => 'wp_listings_import_author', 'echo' => false, 'who' => 'authors' )) . '</p>', 'wp-listings' );
-						_e('<p><input name="plugin_wp_listings_settings[wp_listings_display_idx_link]" id="wp_listings_display_idx_link" type="checkbox" value="1" class="code" ' . checked(1, $options['wp_listings_display_idx_link'], false ) . ' /> Display a link to IDX Broker details page?</p>', 'wp-listings' );
 
-						_e('<p><label><h2>Import Title</h2>
+						_e( '</select>' );
+
+						_e(
+							'<p>Select an author to use when importing listings <br />' . wp_dropdown_users(
+								array(
+									'selected' => $options['wp_listings_import_author'],
+									'name'     => 'plugin_wp_listings_settings[wp_listings_import_author]',
+									'id'       => 'wp_listings_import_author',
+									'echo'     => false,
+									'who'      => 'authors',
+								)
+							) . '</p>',
+							'wp-listings'
+						);
+						_e( '<p><input name="plugin_wp_listings_settings[wp_listings_display_idx_link]" id="wp_listings_display_idx_link" type="checkbox" value="1" class="code" ' . checked( 1, $options['wp_listings_display_idx_link'], false ) . ' /> Display a link to IDX Broker details page?</p>', 'wp-listings' );
+
+						_e(
+							'<p><label><h2>Import Title</h2>
 							By default, imported listings use the street address as the title and permalink. You can customize that further using these available tags:<br />
 							<strong><code>{{listingid}}</code> <code>{{address}}</code> <code>{{city}}</code> <code>{{state}}</code> <code>{{zipcode}}</code></strong>
-							</p><input name="plugin_wp_listings_settings[wp_listings_import_title]" id="wp_listings_import_title" type="text" value="' . esc_html( $options['wp_listings_import_title'] ) . '" size="80" /></label><hr style="clear: both;">', 'wp-listings' );
+							</p><input name="plugin_wp_listings_settings[wp_listings_import_title]" id="wp_listings_import_title" type="text" value="' . esc_html( $options['wp_listings_import_title'] ) . '" size="80" /></label><hr style="clear: both;">',
+							'wp-listings'
+						);
 						echo '</div><!-- #idx-tab -->';
 
 					}
 
 					?>
 
-					<input name="submit" class="button-primary" type="submit" value="<?php esc_attr_e('Save Settings'); ?>" style="margin: 0 0 10px 10px;"/>
+					<input name="submit" class="button-primary" type="submit" value="<?php esc_attr_e( 'Save Settings' ); ?>" style="margin: 0 0 10px 10px;"/>
 				</form>
 			</div>
 		</div>
diff --git a/includes/wp-api.php b/includes/wp-api.php
index cbb0f0f..f645f83 100755
--- a/includes/wp-api.php
+++ b/includes/wp-api.php
@@ -6,47 +6,48 @@
 /**
  * Add the listing meta field keys to WP 4.4+ REST API responses for GET and POST
  */
-if(function_exists('register_rest_field')) {
+if ( function_exists( 'register_rest_field' ) ) {
 	add_action( 'rest_api_init', 'wp_listings_register_listing_meta' );
 }
 function wp_listings_register_listing_meta() {
 
 	$allowed_meta_keys = allowed_meta_keys();
-	foreach($allowed_meta_keys as $listing_meta_key) {
-	    register_rest_field( 'listing',
-	        $listing_meta_key,
-	    	array(
-	            'get_callback'    => 'wp_listings_get_listing_meta',
-	            'update_callback' => 'wp_listings_update_listing_meta',
-	            'schema'          => null,
-	        )
-	    );
+	foreach ( $allowed_meta_keys as $listing_meta_key ) {
+		register_rest_field(
+			'listing',
+			$listing_meta_key,
+			array(
+				'get_callback'    => 'wp_listings_get_listing_meta',
+				'update_callback' => 'wp_listings_update_listing_meta',
+				'schema'          => null,
+			)
+		);
 	}
 }
 /**
  * Another method for adding listing meta field keys to WP 4.4+ REST API responses for GET
  */
 add_filter( 'rest_prepare_listing', 'wp_listings_add_meta_to_json', 10, 3 );
-function wp_listings_add_meta_to_json($data, $post, $request){
+function wp_listings_add_meta_to_json( $data, $post, $request ) {
 
 	$response_data = $data->get_data();
 
 	if ( $request['context'] !== 'view' || is_wp_error( $data ) ) {
-	    return $data;
+		return $data;
 	}
 
 	$allowed_meta_keys = allowed_meta_keys();
 
-	foreach($allowed_meta_keys as $listing_meta_key) {
+	foreach ( $allowed_meta_keys as $listing_meta_key ) {
 		$meta = get_post_meta( $post->ID, $listing_meta_key, true );
 
-		if(!empty($meta)){
-		    $listing_meta[$listing_meta_key] = $meta;
+		if ( ! empty( $meta ) ) {
+			$listing_meta[ $listing_meta_key ] = $meta;
 		}
 	}
 
-	if($post->post_type == 'listing') {
-	    $response_data['listing_meta'] = $listing_meta;
+	if ( $post->post_type == 'listing' ) {
+		$response_data['listing_meta'] = $listing_meta;
 	}
 
 	$data->set_data( $response_data );
@@ -57,8 +58,8 @@ function wp_listings_add_meta_to_json($data, $post, $request){
 /**
  * Get the value of the listing meta key
  *
- * @param array $object Details of current post.
- * @param string $listing_meta_key Name of field.
+ * @param array           $object Details of current post.
+ * @param string          $listing_meta_key Name of field.
  * @param WP_REST_Request $request Current request
  *
  * @return mixed
@@ -66,117 +67,122 @@ function wp_listings_add_meta_to_json($data, $post, $request){
 function wp_listings_get_listing_meta( $object, $listing_meta_key, $request ) {
 	$meta = get_post_meta( $object['id'], $listing_meta_key, true );
 
-	if(!empty($meta))
-    	return $meta;
+	if ( ! empty( $meta ) ) {
+		return $meta;
+	}
 }
 
 /**
  * Handler for updating listing meta key
  *
- * @param mixed $value The value of the field
+ * @param mixed  $value The value of the field
  * @param object $object The object from the response
  * @param string $listing_meta_key Name of field
  *
  * @return bool|int
  */
 function wp_listings_update_listing_meta( $value, $object, $listing_meta_key ) {
-    if ( ! $value || ! is_string( $value ) ) {
-        return;
-    }
-    $value = sanitize_text_field($value);
-    return update_post_meta( $object->ID, $listing_meta_key, strip_tags( $value ) );
+	if ( ! $value || ! is_string( $value ) ) {
+		return;
+	}
+	$value = sanitize_text_field( $value );
+	return update_post_meta( $object->ID, $listing_meta_key, strip_tags( $value ) );
 
 }
 
 /**
  * Add Jetpack JSON Rest API Support
  */
-function wp_listings_allow_post_types($allowed_post_types) {
+function wp_listings_allow_post_types( $allowed_post_types ) {
 	$allowed_post_types[] = 'listing';
 	return $allowed_post_types;
 }
-add_filter( 'rest_api_allowed_post_types', 'wp_listings_allow_post_types');
+add_filter( 'rest_api_allowed_post_types', 'wp_listings_allow_post_types' );
 
 /**
  * Add Jetpack JSON Rest API Support (Listing MetaData)
  */
-function wp_listings_rest_api_allowed_public_metadata( $allowed_meta_keys )
-{
-    // only run for REST API requests
-    if ( ! defined( 'REST_API_REQUEST' ) || ! REST_API_REQUEST )
-        return;
+function wp_listings_rest_api_allowed_public_metadata( $allowed_meta_keys ) {
+	// only run for REST API requests
+	if ( ! defined( 'REST_API_REQUEST' ) || ! REST_API_REQUEST ) {
+		return;
+	}
 
-    $allowed_meta_keys = allowed_meta_keys();
+	$allowed_meta_keys = allowed_meta_keys();
 
-    return $allowed_meta_keys;
+	return $allowed_meta_keys;
 }
 add_filter( 'rest_api_allowed_public_metadata', 'wp_listings_rest_api_allowed_public_metadata' );
 
 /**
  * Keep an array of allowed meta fields for the listing via the api methods
+ *
  * @return allowed_meta_keys the post meta keys
  */
 function allowed_meta_keys() {
-	apply_filters('wp_listings_allowed_api_meta_keys', $allowed_meta_keys = array (
-		'_listing_price',
-	    '_listing_address',
-	    '_listing_city',
-	    '_listing_county',
-	    '_listing_state',
-	    '_listing_zip',
-	    '_listing_country',
-	    '_listing_city',
-	    '_listing_longitude',
-	    '_listing_latitude',
-	    '_listing_mls',
-	    '_listing_open_house',
-	    '_listing_year_built',
-	    '_listing_floors',
-	    '_listing_sqft',
-	    '_listing_lot_sqft',
-	    '_listing_bedrooms',
-	    '_listing_bathrooms',
-	    '_listing_half_bath',
-	    '_listing_garage',
-	    '_listing_pool',
-	    '_listing_text',
-	    '_listing_gallery',
-	    '_listing_video',
-	    '_listing_map',
-	    '_listing_contact_form',
-	    '_listing_featured_on',
-	    '_listing_home_sum',
-	    '_listing_ktichen_sum',
-	    '_listing_living_room',
-	    '_listing_master_suite',
-	    '_listing_school_neighborhood',
-
-	    //IDX
-	    '_listing_proptype',
-	    '_listing_condo',
-	    '_listing_financial',
-	    '_listing_city',
-	    '_listing_condition',
-	    '_listing_construction',
-	    '_listing_exterior',
-	    '_listing_fencing',
-	    '_listing_interior',
-	    '_listing_flooring',
-	    '_listing_heatcool',
-	    '_listing_lotsize',
-	    '_listing_location',
-	    '_listing_scenery',
-	    '_listing_community',
-	    '_listing_recreation',
-	    '_listing_general',
-	    '_listing_inclusions',
-	    '_listing_parking',
-	    '_listing_rooms',
-	    '_listing_laundry',
-	    '_listing_utilities',
-	    '_listing_disclaimer',
-	    '_listing_courtesy'
-	) );
+	apply_filters(
+		'wp_listings_allowed_api_meta_keys',
+		$allowed_meta_keys = array(
+			'_listing_price',
+			'_listing_address',
+			'_listing_city',
+			'_listing_county',
+			'_listing_state',
+			'_listing_zip',
+			'_listing_country',
+			'_listing_city',
+			'_listing_longitude',
+			'_listing_latitude',
+			'_listing_mls',
+			'_listing_open_house',
+			'_listing_year_built',
+			'_listing_floors',
+			'_listing_sqft',
+			'_listing_lot_sqft',
+			'_listing_bedrooms',
+			'_listing_bathrooms',
+			'_listing_half_bath',
+			'_listing_garage',
+			'_listing_pool',
+			'_listing_text',
+			'_listing_gallery',
+			'_listing_video',
+			'_listing_map',
+			'_listing_contact_form',
+			'_listing_featured_on',
+			'_listing_home_sum',
+			'_listing_ktichen_sum',
+			'_listing_living_room',
+			'_listing_master_suite',
+			'_listing_school_neighborhood',
+
+			// IDX
+			'_listing_proptype',
+			'_listing_condo',
+			'_listing_financial',
+			'_listing_city',
+			'_listing_condition',
+			'_listing_construction',
+			'_listing_exterior',
+			'_listing_fencing',
+			'_listing_interior',
+			'_listing_flooring',
+			'_listing_heatcool',
+			'_listing_lotsize',
+			'_listing_location',
+			'_listing_scenery',
+			'_listing_community',
+			'_listing_recreation',
+			'_listing_general',
+			'_listing_inclusions',
+			'_listing_parking',
+			'_listing_rooms',
+			'_listing_laundry',
+			'_listing_utilities',
+			'_listing_disclaimer',
+			'_listing_courtesy',
+		)
+	);
 
 	return $allowed_meta_keys;
 }
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..dbb6871
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+	Customize the rules WP Enforcer uses by editing this file according to PHP_CodeSniffer's
+	ruleset.xml standard: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
+-->
+<ruleset name="WP-Enforcer">
+	<description>Coding standards from WP Enforcer.</description>
+
+	<!-- FILES -->
+	<exclude-pattern>phpcs.xml</exclude-pattern>
+	<exclude-pattern>*/tests/*</exclude-pattern>
+	<exclude-pattern>*/vendor/*</exclude-pattern>
+
+	<!--
+		Don't get angry about checking files that don't contain code
+		@link https://github.com/stevegrunwell/wp-enforcer/issues/12
+	-->
+	<rule ref="Internal.NoCodeFound">
+		<severity>0</severity>
+	</rule>
+
+	<rule ref="WordPress-Extra" />
+	<rule ref="WordPress-Docs" />
+</ruleset>
\ No newline at end of file
diff --git a/plugin.php b/plugin.php
index 37a6da1..81dc057 100755
--- a/plugin.php
+++ b/plugin.php
@@ -30,8 +30,8 @@ function wp_listings_activation() {
 	}
 	flush_rewrite_rules();
 
-	$notice_keys = array('wpl_notice_idx', 'wpl_listing_notice_idx', 'wpl_notice_equity');
-	foreach ($notice_keys as $notice) {
+	$notice_keys = array( 'wpl_notice_idx', 'wpl_listing_notice_idx', 'wpl_notice_equity' );
+	foreach ( $notice_keys as $notice ) {
 		delete_user_meta( get_current_user_id(), $notice );
 	}
 }
@@ -46,8 +46,8 @@ function wp_listings_deactivation() {
 
 	flush_rewrite_rules();
 
-	$notice_keys = array('wpl_notice_idx', 'wpl_listing_notice_idx', 'wpl_notice_equity');
-	foreach ($notice_keys as $notice) {
+	$notice_keys = array( 'wpl_notice_idx', 'wpl_listing_notice_idx', 'wpl_notice_equity' );
+	foreach ( $notice_keys as $notice ) {
 		delete_user_meta( get_current_user_id(), $notice );
 	}
 }
@@ -72,114 +72,117 @@ function wp_listings_init() {
 	load_plugin_textdomain( 'wp-listings', false, basename( dirname( __FILE__ ) ) . '/languages/' );
 
 	/** Includes */
-	require_once( dirname( __FILE__ ) . '/includes/helpers.php' );
-	require_once( dirname( __FILE__ ) . '/includes/functions.php' );
-	require_once( dirname( __FILE__ ) . '/includes/shortcodes.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-listings.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-listing-import.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-taxonomies.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-listing-template.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-listings-search-widget.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-featured-listings-widget.php' );
-	require_once( dirname( __FILE__ ) . '/includes/class-admin-notice.php' );
-	require_once( dirname( __FILE__ ) . '/includes/wp-api.php' );
+	require_once dirname( __FILE__ ) . '/includes/helpers.php';
+	require_once dirname( __FILE__ ) . '/includes/functions.php';
+	require_once dirname( __FILE__ ) . '/includes/shortcodes.php';
+	require_once dirname( __FILE__ ) . '/includes/class-listings.php';
+	require_once dirname( __FILE__ ) . '/includes/class-listing-import.php';
+	require_once dirname( __FILE__ ) . '/includes/class-taxonomies.php';
+	require_once dirname( __FILE__ ) . '/includes/class-listing-template.php';
+	require_once dirname( __FILE__ ) . '/includes/class-listings-search-widget.php';
+	require_once dirname( __FILE__ ) . '/includes/class-featured-listings-widget.php';
+	require_once dirname( __FILE__ ) . '/includes/class-admin-notice.php';
+	require_once dirname( __FILE__ ) . '/includes/wp-api.php';
 
 	/** Add theme support for post thumbnails if it does not exist */
-	if(!current_theme_supports('post-thumbnails')) {
+	if ( ! current_theme_supports( 'post-thumbnails' ) ) {
 		add_theme_support( 'post-thumbnails' );
 	}
 
 	/** Registers and enqueues scripts for single listings */
-	add_action('wp_enqueue_scripts', 'add_wp_listings_scripts');
+	add_action( 'wp_enqueue_scripts', 'add_wp_listings_scripts' );
 	function add_wp_listings_scripts() {
-		wp_register_script( 'wp-listings-single', WP_LISTINGS_URL . 'includes/js/single-listing.min.js', array('jquery'), null, true ); // enqueued only on single listings
-		wp_register_script( 'jquery-validate', WP_LISTINGS_URL . 'includes/js/jquery.validate.min.js', array('jquery'), null, true ); // enqueued only on single listings
-		wp_register_script( 'fitvids', '//cdnjs.cloudflare.com/ajax/libs/fitvids/1.1.0/jquery.fitvids.min.js', array('jquery'), null, true ); // enqueued only on single listings
+		wp_register_script( 'wp-listings-single', WP_LISTINGS_URL . 'includes/js/single-listing.min.js', array( 'jquery' ), null, true ); // enqueued only on single listings
+		wp_register_script( 'jquery-validate', WP_LISTINGS_URL . 'includes/js/jquery.validate.min.js', array( 'jquery' ), null, true ); // enqueued only on single listings
+		wp_register_script( 'fitvids', '//cdnjs.cloudflare.com/ajax/libs/fitvids/1.1.0/jquery.fitvids.min.js', array( 'jquery' ), null, true ); // enqueued only on single listings
 		wp_enqueue_script( 'jquery' );
-		wp_enqueue_script( 'jquery-ui-tabs', array('jquery') );
-    }
+		wp_enqueue_script( 'jquery-ui-tabs', array( 'jquery' ) );
+	}
 
 	/** Enqueues wp-listings.css style file if it exists and is not deregistered in settings */
-	add_action('wp_enqueue_scripts', 'add_wp_listings_main_styles');
+	add_action( 'wp_enqueue_scripts', 'add_wp_listings_main_styles' );
 	function add_wp_listings_main_styles() {
 
-		$options = get_option('plugin_wp_listings_settings');
+		$options = get_option( 'plugin_wp_listings_settings' );
 
-		/** Register single styles but don't enqueue them **/
-		wp_register_style('wp-listings-single', WP_LISTINGS_URL . 'includes/css/wp-listings-single.css', '', null, 'all');
+		/** Register single styles but don't enqueue them */
+		wp_register_style( 'wp-listings-single', WP_LISTINGS_URL . 'includes/css/wp-listings-single.css', '', null, 'all' );
 
 		/** Register Font Awesome icons but don't enqueue them */
 		wp_register_style( 'font-awesome-4.7.0', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css', array(), '4.7.0', 'all' );
 
-
 		/** Register Properticons but don't enqueue them */
-		wp_register_style('properticons', '//s3.amazonaws.com/properticons/css/properticons.css', '', null, 'all');
+		wp_register_style( 'properticons', '//s3.amazonaws.com/properticons/css/properticons.css', '', null, 'all' );
 
-		if ( !isset($options['wp_listings_stylesheet_load']) ) {
+		if ( ! isset( $options['wp_listings_stylesheet_load'] ) ) {
 			$options['wp_listings_stylesheet_load'] = 0;
 		}
 
-		if ('1' == $options['wp_listings_stylesheet_load'] ) {
+		if ( '1' == $options['wp_listings_stylesheet_load'] ) {
 			return;
 		}
 
-        if ( file_exists(dirname( __FILE__ ) . '/includes/css/wp-listings.css') ) {
-        	wp_register_style('wp_listings', WP_LISTINGS_URL . 'includes/css/wp-listings.css', '', null, 'all');
-            wp_enqueue_style('wp_listings');
-        }
-    }
+		if ( file_exists( dirname( __FILE__ ) . '/includes/css/wp-listings.css' ) ) {
+			wp_register_style( 'wp_listings', WP_LISTINGS_URL . 'includes/css/wp-listings.css', '', null, 'all' );
+			wp_enqueue_style( 'wp_listings' );
+		}
+	}
 
-    /** Enqueues wp-listings-widgets.css style file if it exists and is not deregistered in settings */
-	add_action('wp_enqueue_scripts', 'add_wp_listings_widgets_styles');
+	/** Enqueues wp-listings-widgets.css style file if it exists and is not deregistered in settings */
+	add_action( 'wp_enqueue_scripts', 'add_wp_listings_widgets_styles' );
 	function add_wp_listings_widgets_styles() {
 
-		$options = get_option('plugin_wp_listings_settings');
+		$options = get_option( 'plugin_wp_listings_settings' );
 
-		if ( !isset($options['wp_listings_widgets_stylesheet_load']) ) {
+		if ( ! isset( $options['wp_listings_widgets_stylesheet_load'] ) ) {
 			$options['wp_listings_widgets_stylesheet_load'] = 0;
 		}
 
-		if ('1' == $options['wp_listings_widgets_stylesheet_load'] ) {
+		if ( '1' == $options['wp_listings_widgets_stylesheet_load'] ) {
 			return;
 		}
 
-        if ( file_exists(dirname( __FILE__ ) . '/includes/css/wp-listings-widgets.css') ) {
-        	wp_register_style('wp_listings_widgets', WP_LISTINGS_URL . 'includes/css/wp-listings-widgets.css', '', null, 'all');
-            wp_enqueue_style('wp_listings_widgets');
-        }
-    }
+		if ( file_exists( dirname( __FILE__ ) . '/includes/css/wp-listings-widgets.css' ) ) {
+			wp_register_style( 'wp_listings_widgets', WP_LISTINGS_URL . 'includes/css/wp-listings-widgets.css', '', null, 'all' );
+			wp_enqueue_style( 'wp_listings_widgets' );
+		}
+	}
 
-    /** Add admin scripts and styles */
-    function wp_listings_admin_scripts_styles() {
-    	$screen_id = get_current_screen();
-		if($screen_id->id === 'listing_page_wp-listings-settings') {
+	/** Add admin scripts and styles */
+	function wp_listings_admin_scripts_styles() {
+		$screen_id = get_current_screen();
+		if ( $screen_id->id === 'listing_page_wp-listings-settings' ) {
 			wp_enqueue_script( 'jquery-ui-tabs' );
 			wp_enqueue_style( 'jquery-ui-css', '//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css' );
 		}
 
-        wp_enqueue_style( 'wp_listings_admin_css', WP_LISTINGS_URL . 'includes/css/wp-listings-admin.css' );
+		wp_enqueue_style( 'wp_listings_admin_css', WP_LISTINGS_URL . 'includes/css/wp-listings-admin.css' );
 
-        /** Enqueue Font Awesome in the Admin if IDX Broker is not installed */
-		if (!class_exists( 'Idx_Broker_Plugin' )) {
+		/** Enqueue Font Awesome in the Admin if IDX Broker is not installed */
+		if ( ! class_exists( 'Idx_Broker_Plugin' ) ) {
 			wp_enqueue_style( 'font-awesome-4.7.0', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css', array(), '4.7.0' );
-			wp_enqueue_style('upgrade-icon', WP_LISTINGS_URL . 'includes/css/wp-listings-upgrade.css');
+			wp_enqueue_style( 'upgrade-icon', WP_LISTINGS_URL . 'includes/css/wp-listings-upgrade.css' );
 		}
 
-        global $wp_version;
-        $nonce_action = 'wp_listings_admin_notice';
+		global $wp_version;
+		$nonce_action = 'wp_listings_admin_notice';
 
 		wp_enqueue_style( 'wp-listings-admin-notice', WP_LISTINGS_URL . 'includes/css/wp-listings-admin-notice.css' );
 		wp_enqueue_script( 'wp-listings-admin', WP_LISTINGS_URL . 'includes/js/admin.js', 'media-views' );
-		wp_localize_script( 'wp-listings-admin', 'wp_listings_adminL10n', array(
-			'ajaxurl'    => admin_url( 'admin-ajax.php' ),
-			'nonce'      => wp_create_nonce( $nonce_action ),
-			'wp_version' => $wp_version,
-			'dismiss'    => __( 'Dismiss this notice', 'wp-listings' ),
-		) );
+		wp_localize_script(
+			'wp-listings-admin',
+			'wp_listings_adminL10n',
+			array(
+				'ajaxurl'    => admin_url( 'admin-ajax.php' ),
+				'nonce'      => wp_create_nonce( $nonce_action ),
+				'wp_version' => $wp_version,
+				'dismiss'    => __( 'Dismiss this notice', 'wp-listings' ),
+			)
+		);
 
 		$localize_script = array(
-			'title'        => __( 'Set Term Image', 'wp-listings' ),
-			'button'       => __( 'Set term image', 'wp-listings' )
+			'title'  => __( 'Set Term Image', 'wp-listings' ),
+			'button' => __( 'Set term image', 'wp-listings' ),
 		);
 
 		/* Pass custom variables to the script. */
@@ -190,17 +193,16 @@ function wp_listings_admin_scripts_styles() {
 	}
 	add_action( 'admin_enqueue_scripts', 'wp_listings_admin_scripts_styles' );
 
-
-
 	/** Instantiate */
-	$_wp_listings = new WP_Listings;
-	$_wp_listings_taxonomies = new WP_Listings_Taxonomies;
-	$_wp_listings_templates = new Single_Listing_Template;
+	$_wp_listings            = new WP_Listings();
+	$_wp_listings_taxonomies = new WP_Listings_Taxonomies();
+	$_wp_listings_templates  = new Single_Listing_Template();
 
 	add_action( 'widgets_init', 'wp_listings_register_widgets' );
 
 	/**
 	 * Function to add admin notices
+	 *
 	 * @param  string  $message    the error messag text
 	 * @param  boolean $error      html class - true for error false for updated
 	 * @param  string  $cap_check  required capability
@@ -210,17 +212,18 @@ function wp_listings_admin_scripts_styles() {
 	 * @since  1.3
 	 */
 	function wp_listings_admin_notice( $message, $error = false, $cap_check = 'activate_plugins', $ignore_key = false ) {
-		$_wp_listings_admin = new WP_Listings_Admin_Notice;
+		$_wp_listings_admin = new WP_Listings_Admin_Notice();
 		return $_wp_listings_admin->notice( $message, $error, $cap_check, $ignore_key );
 	}
 
 	/**
 	 * Admin notice AJAX callback
+	 *
 	 * @since  1.3
 	 */
 	add_action( 'wp_ajax_wp_listings_admin_notice', 'wp_listings_admin_notice_cb' );
 	function wp_listings_admin_notice_cb() {
-		$_wp_listings_admin = new WP_Listings_Admin_Notice;
+		$_wp_listings_admin = new WP_Listings_Admin_Notice();
 		return $_wp_listings_admin->ajax_cb();
 	}
 
diff --git a/uninstall.php b/uninstall.php
index abac9e7..3e32eb5 100755
--- a/uninstall.php
+++ b/uninstall.php
@@ -1,21 +1,23 @@
 <?php
-if( !defined( 'ABSPATH') && !defined('WP_UNINSTALL_PLUGIN') ) exit();
+if ( ! defined( 'ABSPATH' ) && ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+	exit();
+}
 
-$settings = get_option('plugin_wp_listings_settings');
+$settings = get_option( 'plugin_wp_listings_settings' );
 
-if($settings['wp_listings_uninstall_delete'] == true) {
+if ( $settings['wp_listings_uninstall_delete'] == true ) {
 
 	wp_listings_delete_listings();
 
 	// Delete our Options
-	delete_site_option('plugin_wp_listings_settings');
-	delete_site_option('wp_listings_idx_featured_listing_wp_options');
-	delete_site_option('wp_listings_taxonomies');
-	delete_site_option('widget_wplistings-featured-listings');
-	delete_site_option('widget_listings-search');
+	delete_site_option( 'plugin_wp_listings_settings' );
+	delete_site_option( 'wp_listings_idx_featured_listing_wp_options' );
+	delete_site_option( 'wp_listings_taxonomies' );
+	delete_site_option( 'widget_wplistings-featured-listings' );
+	delete_site_option( 'widget_listings-search' );
 
 	// Delete cron job
-	wp_clear_scheduled_hook('wp_listings_idx_update');
+	wp_clear_scheduled_hook( 'wp_listings_idx_update' );
 
 }
 
@@ -24,27 +26,27 @@ function wp_listings_delete_listings() {
 		global $wpdb;
 
 		// Get all Listings
-	    $args = array (
-    		'post_type' => array('listing'),
-			'nopaging' => true
+		$args = array(
+			'post_type' => array( 'listing' ),
+			'nopaging'  => true,
 		);
 
-        // Remove all Listings
-		$query = new WP_Query ($args);
-			while ($query->have_posts()) {
-				$query->the_post();
-				$id = get_the_ID();
-				$taxonomies = array( 'status', 'locations', 'features', 'property-types' );
-				$post_featured_image_id = get_post_thumbnail_id($id);
+		// Remove all Listings
+		$query = new WP_Query( $args );
+	while ( $query->have_posts() ) {
+		$query->the_post();
+		$id                     = get_the_ID();
+		$taxonomies             = array( 'status', 'locations', 'features', 'property-types' );
+		$post_featured_image_id = get_post_thumbnail_id( $id );
 
-				wp_delete_attachment( $post_featured_image_id );
-				delete_post_meta_by_key( !empty($id->ID) );
-                wp_delete_object_term_relationships( $id, $taxonomies );
-                wp_delete_post( $id, true );
-        }
+		wp_delete_attachment( $post_featured_image_id );
+		delete_post_meta_by_key( ! empty( $id->ID ) );
+		wp_delete_object_term_relationships( $id, $taxonomies );
+		wp_delete_post( $id, true );
+	}
 
-        $wpdb->query("DELETE FROM `{$wpdb->prefix}options` WHERE option_name LIKE '_transient_equity_listing_%'");
+		$wpdb->query( "DELETE FROM `{$wpdb->prefix}options` WHERE option_name LIKE '_transient_equity_listing_%'" );
 
-        // Reset PostData
+		// Reset PostData
 		wp_reset_postdata();
 }