diff --git a/README.md b/README.md
deleted file mode 100644
index d707b45..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# wpem-rest-api
diff --git a/admin/templates/html-app-branding.php b/admin/templates/html-app-branding.php
index fb80be5..7c84717 100644
--- a/admin/templates/html-app-branding.php
+++ b/admin/templates/html-app-branding.php
@@ -1,17 +1,18 @@
 <?php
-/**
- * Admin view: Edit API keys
- */
-
-defined('ABSPATH') || exit;
-?>
+defined('ABSPATH') || exit; ?>
 
 <div id="key-fields" class="settings-panel">
     <h3 class="wpem-admin-tab-title"><?php esc_html_e('App Branding', 'wpem-rest-api'); ?></h3>
     <div class="wpem-branding-status"></div>
     <div class="app-branding-mode">
-        <div class="wpem-light-mode button"><label>Day</label><img src="<?php echo WPEM_REST_API_PLUGIN_URL;?>/assets/images/sun.png" alt=""></div>
-        <div class="wpem-dark-mode button"><label>Night</label><img src="<?php echo WPEM_REST_API_PLUGIN_URL;?>/assets/images/moon.png" alt=""></div>
+        <div class="wpem-light-mode button">
+            <label>Day</label>
+            <img src="<?php echo WPEM_REST_API_PLUGIN_URL;?>/assets/images/sun.png" alt="">
+        </div>
+        <div class="wpem-dark-mode button">
+            <label>Night</label>
+            <img src="<?php echo WPEM_REST_API_PLUGIN_URL;?>/assets/images/moon.png" alt="">
+        </div>
     </div>
 
     <table id="app-branding-color" class="form-table">
@@ -37,19 +38,24 @@
 
         <tbody>
             <tr valign="top">
-                <td scope="row" class="title-primary-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
+                <td scope="row" class="title-primary-color"> 
+                    <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
                     <input type="text" name="wpem_primary_color" class="wpem-colorpicker" value="<?php echo esc_html($primary_color); ?>" data-default-color="#3366FF">
                 </td>
-                <td scope="row" class="title-success-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
+                <td scope="row" class="title-success-color"> 
+                    <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
                     <input type="text" name="wpem_success_color" class="wpem-colorpicker" value="<?php echo esc_html($success_color); ?>" data-default-color="#77DD37">
                 </td>
-                <td scope="row" class="title-info-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
+                <td scope="row" class="title-info-color"> 
+                    <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
                     <input type="text" name="wpem_info_color" class="wpem-colorpicker" value="<?php echo esc_html($info_color); ?>" data-default-color="#42BCFF">
                 </td>
-                <td scope="row" class="title-warning-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
+                <td scope="row" class="title-warning-color"> 
+                    <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
                     <input type="text" name="wpem_warning_color" class="wpem-colorpicker" value="<?php echo esc_html($warning_color); ?>" data-default-color="#FCD837">
                 </td>
-                <td scope="row" class="title-danger-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
+                <td scope="row" class="title-danger-color"> 
+                    <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
                     <input type="text" name="wpem_danger_color" class="wpem-colorpicker" value="<?php echo esc_html($danger_color); ?>" data-default-color="#FC4C20">
                 </td>
             </tr>
@@ -57,119 +63,93 @@
             <tr valign="top">
                 <td scope="row" id="wpem_primary_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
-
                         $code = wpem_rest_api_color_brightness($primary_color, $adjust_percentage);
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness).'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($primary_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_success_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
 
                         $code = wpem_rest_api_color_brightness($success_color, $adjust_percentage);
-                        
-
                         if($i < 5) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($success_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_info_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
-
                         $code = wpem_rest_api_color_brightness($info_color, $adjust_percentage);
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($info_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_warning_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
+                    for( $i = 1; $i < 10; $i++ ) {
                         $brightness = (1000 - $i*100);
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($warning_color, $adjust_percentage);
-                        
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($warning_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_danger_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1 ; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($danger_color, $adjust_percentage);
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'.esc_html($brightness).'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($danger_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
             </tr>
         </tbody>
     </table>
-
-        <table id="app-branding-color-dark" class="form-table">
+    <table id="app-branding-color-dark" class="form-table">
         <thead>
             <tr valign="top">
                 <th scope="row" class="title-primary">
@@ -189,7 +169,6 @@
                 </th>
             </tr>
         </thead>
-
         <tbody>
             <tr valign="top">
                 <td scope="row" class="title-primary-color"> <p><?php _e('Select color', 'wpem-rest-api'); ?></p>
@@ -208,121 +187,94 @@
                     <input type="text" name="wpem_danger_dark_color" class="wpem-colorpicker" value="<?php echo esc_attr($danger_dark_color); ?>" data-default-color="#FC4C20">
                 </td>
             </tr>
-
             <tr valign="top">
                 <td scope="row" id="wpem_primary_dark_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1 ; $i < 10 ; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($primary_dark_color, $adjust_percentage);
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($primary_dark_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_success_dark_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($success_dark_color, $adjust_percentage);
-                        
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($success_dark_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_info_dark_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($info_dark_color, $adjust_percentage);
-                        
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($info_dark_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_warning_dark_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($warning_dark_color, $adjust_percentage);
-                    
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($warning_dark_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
                 <td scope="row" id="wpem_danger_dark_color">
                     <?php
-                    for($i=1;$i<10;$i++)
-                    {
-                        $brightness = (1000 - $i*100);
+                    for( $i = 1; $i < 10; $i++ ) {
+                        $brightness = ( 1000 - $i*100 );
                         $adjust_percentage = $i/10;
-                        if($brightness == 500) {
+                        if( $brightness == 500 ) {
                             $adjust_percentage = 0;
                         }
                         $code = wpem_rest_api_color_brightness($danger_dark_color, $adjust_percentage);
-                        
 
-                        if($i < 5) {
+                        if( $i < 5 ) {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:#fff">'.esc_html($code).'</span></div></div>';    
-                        }
-                        else
-                        {
+                        } else {
                             echo '<div class="wpem-color-pallet-wrapper"><div>'. esc_html($brightness) .'</div> <div class="wpem-color-pallet" style="background-color:'.esc_html($code).'" data-color-code="'.esc_html($code).'"><span style="color:'.esc_html($danger_dark_color).'">'.esc_html($code).'</span></div></div>';    
                         }
-                    }
-                    ?>
+                    } ?>
                 </td>
             </tr>
         </tbody>
     </table>
-
     <?php submit_button(__('Save', 'wpem-rest-api'), 'primary wpem-backend-theme-button', 'update_app_branding'); ?>
-
-</div>
+</div>
\ No newline at end of file
diff --git a/admin/templates/html-keys-edit.php b/admin/templates/html-keys-edit.php
index 6ddb56c..f177439 100644
--- a/admin/templates/html-keys-edit.php
+++ b/admin/templates/html-keys-edit.php
@@ -1,188 +1,146 @@
 <?php
-/**
- * Admin view: Edit API keys
- *
- */
-
-defined( 'ABSPATH' ) || exit;
-?>
+defined( 'ABSPATH' ) || exit; ?>
 
 <div id="key-fields" class="settings-panel">
 	<h3 class="wpem-admin-tab-title"><?php esc_html_e( 'Key details', 'wpem-rest-api' ); ?></h3>
 
 	<input type="hidden" id="key_id" value="<?php echo esc_attr( $key_id ); ?>" />
 	<div class="wpem-admin-body">
-	<table id="api-keys-options" class="form-table">
-		<tbody>
-			<tr valign="top">
-				<th scope="row" class="titledesc">
-					<label for="key_description">
-						<?php esc_html_e( 'Description', 'wpem-rest-api' ); ?>
-						<?php  _e( 'Friendly name for identifying this key.', 'wpem-rest-api' ); ?>
-					</label>
-				</th>
-				<td class="forminp">
-					<input id="key_description" type="text" class="input-text regular-input" value="<?php echo esc_attr( $key_data['description'] ); ?>" />
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row" class="titledesc">
-					<label for="key_user">
-						<?php //esc_html_e( 'Event', 'wpem-rest-api' ); ?>
-						
-					</label>
-				</th>
-				<td class="forminp">
-					<?php
-					$event_id        = ! empty( $key_data['event_id'] ) ? absint( $key_data['event_id'] ) : '';
-					// $events = get_posts(array(
-					// 						'post_type'        => 'event_listing',
-					// 						'numberposts' =>-1,
-					// 						'author'        =>  get_current_user_id(),
-					// 						'post_status'    => 'publish',
-					// 					));
-
-					$events = array();
-				
-					?>
-					<!-- <select class="wpem-enhanced-select" id="event_id" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
-						<option value=""><?php _e('All Events','wpem-rest-api');?></option>
-						<?php foreach ($events as $keys => $event) { ?>
-							<option value="<?php echo esc_attr( $event->ID ); ?>" <?php if($event_id == $event->ID )  echo 'selected="selected"';?>><?php echo htmlspecialchars( wp_kses_post($event->post_title ) ); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
-						<?php
-						}
-						?>
-						
-					</select> -->
-					<!-- <p class="description"><?php _e('select the event for which the key is generating. You can keep it All events if you want to connect the other end point for all of them.
-','wpem-rest-api');?></p>  -->
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row" class="titledesc">
-					<label for="key_user">
-						<?php esc_html_e( 'User', 'wpem-rest-api' ); ?>
-						<?php  _e( 'Owner of these keys.', 'wpem-rest-api' ); ?>
-					</label>
-				</th>
-				<td class="forminp">
-					<?php
-
-					$all_users = get_users( );
-
-					$user_id        = ! empty( $key_data['user_id'] ) ? absint( $key_data['user_id'] ) : '';
-
-					?>
-					<select class="event-manager-select-chosen" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
+		<table id="api-keys-options" class="form-table">
+			<tbody>
+				<tr valign="top">
+					<th scope="row" class="titledesc">
+						<label for="key_description">
+							<?php esc_html_e( 'Description', 'wpem-rest-api' ); ?>
+						</label>
+					</th>
+					<td class="forminp">
+						<input id="key_description" type="text" class="input-text regular-input" value="<?php echo esc_attr( $key_data['description'] ); ?>" />
+						<p class="description"><?php _e( 'Friendly name for identifying this key.', 'wpem-rest-api' );?></p>
+					</td>
+				</tr>
+				<tr valign="top">
+					<th scope="row" class="titledesc">
+						<label for="key_user"> </label>
+					</th>
+					<td class="forminp">
 						<?php
-												// Array of WP_User objects.
-						foreach ( $all_users as $user ) { ?>
-						   <option value="<?php echo esc_attr( $user->ID ); ?>"  <?php if($user->ID == $user_id )  echo 'selected="selected"';?>><?php 
-						   echo '#'; 
-						   printf(__('%d','wpem-rest-api'),$user->ID);
-						   echo ' ';
-						    printf(__('%s','wpem-rest-api'),$user->user_login); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
-						   <?php
-						}
-
-						?>
-						
-					</select>
-					<p class="description"><?php _e('Name of the owner of the Key.
-','wpem-rest-api');?></p> 
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row" class="titledesc">
-					<label for="key_description">
-						<?php esc_html_e( 'Expiry date', 'wpem-rest-api' ); ?>
-					</label>
-				</th>
-				<td class="forminp">
-				<?php
-				//convert date and time into date format
-				if(isset($key_data['date_expires']) && !empty($key_data['date_expires']))
-				$expiry_date = date('Y-m-d',strtotime($key_data['date_expires'])); 
-				else
-				$expiry_date = ''; 
-				?>
-					<input id="date_expires" type="text" class="input-text regular-input" value="<?php echo esc_attr($expiry_date ); ?>" />
-					<p class="description"><?php _e('Set an expiry date till which the key should be activated.','wpem-rest-api');?></p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row" class="titledesc">
-					<label for="key_permissions">
-						<?php esc_html_e( 'Permissions', 'wpem-rest-api' ); ?>
-						
-					</label>
-				</th>
-				<td class="forminp">
-					<select id="key_permissions" class="wpem-enhanced-select">
+						$event_id        = ! empty( $key_data['event_id'] ) ? absint( $key_data['event_id'] ) : '';
+						$events = array(); ?>
+					</td>
+				</tr>
+				<tr valign="top">
+					<th scope="row" class="titledesc">
+						<label for="key_user">
+							<?php esc_html_e( 'User', 'wpem-rest-api' ); ?>
+							<?php  _e( 'Owner of these keys.', 'wpem-rest-api' ); ?>
+						</label>
+					</th>
+					<td class="forminp">
 						<?php
-						$permissions = array(
-							'read'       => __( 'Read', 'wpem-rest-api' ),
-							'write'      => __( 'Write', 'wpem-rest-api' ),
-							'read_write' => __( 'Read/Write', 'wpem-rest-api' ),
-						);
 
-						foreach ( $permissions as $permission_id => $permission_name ) :
-							?>
-							<option value="<?php echo esc_attr( $permission_id ); ?>" <?php selected( $key_data['permissions'], $permission_id, true ); ?>><?php echo esc_html( $permission_name ); ?></option>
-						<?php endforeach; ?>
-					</select>
-					<p class="description">
-					<?php   _e( 'Select the access type of these keys.', 'wpem-rest-api' ); ?></p>
-				</td>
-			</tr>
-
-			<?php if ( 0 !== $key_id ) : ?>
+						$all_users = get_users( );
+						$user_id        = ! empty( $key_data['user_id'] ) ? absint( $key_data['user_id'] ) : ''; ?>
+						<select class="event-manager-select-chosen" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
+							<?php
+							foreach ( $all_users as $user ) { ?>
+							<option value="<?php echo esc_attr( $user->ID ); ?>"  <?php if($user->ID == $user_id )  echo 'selected="selected"';?>><?php 
+							echo '#'; 
+							printf(__('%d','wpem-rest-api'),$user->ID);
+							echo ' ';
+								printf(__('%s','wpem-rest-api'),$user->user_login); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
+							<?php
+							} ?>
+						</select>
+						<p class="description"><?php _e( 'Name of the owner of the Key.', 'wpem-rest-api' );?></p> 
+					</td>
+				</tr>
 				<tr valign="top">
 					<th scope="row" class="titledesc">
-						<?php esc_html_e( 'Consumer key ending in', 'wpem-rest-api' ); ?>
+						<label for="key_description">
+							<?php esc_html_e( 'Expiry date', 'wpem-rest-api' ); ?>
+						</label>
 					</th>
 					<td class="forminp">
-						<code>&hellip;<?php echo esc_html( $key_data['truncated_key'] ); ?></code>
+						<?php
+						//convert date and time into date format
+						if( isset( $key_data['date_expires'] ) && !empty( $key_data['date_expires'] ) ) {
+							$expiry_date = date( 'Y-m-d', strtotime( $key_data['date_expires'] ) ); 
+						} else { 
+							$expiry_date = '';  
+						} ?>
+						<input id="date_expires" type="text" class="input-text regular-input" value="<?php echo esc_attr($expiry_date ); ?>" />
+						<p class="description">
+							<?php _e( 'Set an expiry date till which the key should be activated.','wpem-rest-api' );?>
+						</p>
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row" class="titledesc">
-						<?php esc_html_e( 'Last access', 'wpem-rest-api' ); ?>
+						<label for="key_permissions">
+							<?php esc_html_e( 'Permissions', 'wpem-rest-api' ); ?>
+						</label>
 					</th>
 					<td class="forminp">
-						<span>
-						<?php
-						if ( ! empty( $key_data['last_access'] ) ) {
-							/* translators: 1: last access date 2: last access time */
-							$date = sprintf( __( '%1$s at %2$s', 'wp-event-manager-organizer-app-access' ), date_i18n( get_option('date_format'), strtotime( $key_data['last_access'] ) ), date_i18n(get_option('time_format'), strtotime( $key_data['last_access'] ) ) );
-
-							echo esc_html( apply_filters( 'wpem_api_key_last_access_datetime', $date, $key_data['last_access'] ) );
-						} else {
-							esc_html_e( 'Unknown', 'wpem-rest-api' );
-						}
-						?>
-						</span>
+						<select id="key_permissions" class="wpem-enhanced-select">
+							<?php
+							$permissions = array(
+								'read'       => __( 'Read', 'wpem-rest-api' ),
+								'write'      => __( 'Write', 'wpem-rest-api' ),
+								'read_write' => __( 'Read/Write', 'wpem-rest-api' ),
+							);
+							foreach ( $permissions as $permission_id => $permission_name ) : ?>
+								<option value="<?php echo esc_attr( $permission_id ); ?>" <?php selected( $key_data['permissions'], $permission_id, true ); ?>><?php echo esc_html( $permission_name ); ?></option>
+							<?php endforeach; ?>
+						</select>
+						<p class="description">
+						<?php   _e( 'Select the access type of these keys.', 'wpem-rest-api' ); ?></p>
 					</td>
 				</tr>
-			<?php endif ?>
-		</tbody>
-	</table>
+
+				<?php if ( 0 !== $key_id ) : ?>
+					<tr valign="top">
+						<th scope="row" class="titledesc">
+							<?php esc_html_e( 'Consumer key ending in', 'wpem-rest-api' ); ?>
+						</th>
+						<td class="forminp">
+							<code>&hellip;<?php echo esc_html( $key_data['truncated_key'] ); ?></code>
+						</td>
+					</tr>
+					<tr valign="top">
+						<th scope="row" class="titledesc">
+							<?php esc_html_e( 'Last access', 'wpem-rest-api' ); ?>
+						</th>
+						<td class="forminp">
+							<span>
+								<?php
+								if ( ! empty( $key_data['last_access'] ) ) {
+									/* translators: 1: last access date 2: last access time */
+									$date = sprintf( __( '%1$s at %2$s', 'wp-event-manager-organizer-app-access' ), date_i18n( get_option('date_format'), strtotime( $key_data['last_access'] ) ), date_i18n(get_option('time_format'), strtotime( $key_data['last_access'] ) ) );
+
+									echo esc_html( apply_filters( 'wpem_api_key_last_access_datetime', $date, $key_data['last_access'] ) );
+								} else {
+									esc_html_e( 'Unknown', 'wpem-rest-api' );
+								} ?>
+							</span>
+						</td>
+					</tr>
+				<?php endif ?>
+			</tbody>
+		</table>	
 	</div>
 
-	<?php do_action( 'wpem_admin_key_fields', $key_data ); ?>
+	<?php do_action( 'wpem_admin_key_fields', $key_data ); 
 
-	<?php
 	if ( 0 === intval( $key_id ) ) {
 		submit_button( __( 'Generate API key', 'wp-event-manager-organizer-app-access' ), 'primary wpem-backend-theme-button', 'update_api_key' );
-	} else {
-		?>
+	} else { ?>
 		<p class="submit">
 			<?php submit_button( __( 'Save changes', 'wp-event-manager-organizer-app-access' ), 'primary wpem-backend-theme-button', 'update_api_key', false ); ?>
 			<a class="wpem-backend-theme-button wpem-revoke-button" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' ) ), 'revoke' ) ); ?>"><?php esc_html_e( 'Revoke key', 'wpem-rest-api' ); ?></a>
 		</p>
 		<?php
-	}
-	?>
+	} ?>
 </div>
 
 <script type="text/template" id="tmpl-api-keys-template">
@@ -195,6 +153,7 @@
 				</th>
 				<td class="forminp">
 					<input id="app_key" type="text" value="{{ data.app_key }}" size="55" readonly="readonly">
+					<button class="wpem-backend-theme-button" type="button" onClick="app_key_copy_fun()" style="cursor:pointer">Copy App Key</button>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -203,6 +162,7 @@
 				</th>
 				<td class="forminp">
 					<input id="key_consumer_key" type="text" value="{{ data.consumer_key }}" size="55" readonly="readonly">
+					<button class="wpem-backend-theme-button" type="button" onClick="consumer_copy_fun()" style="cursor:pointer">Copy Consumer Key</button>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -211,6 +171,7 @@
 				</th>
 				<td class="forminp">
 					<input id="key_consumer_secret" type="text" value="{{ data.consumer_secret }}" size="55" readonly="readonly">
+					<button class="wpem-backend-theme-button" type="button" onClick="secret_copy_fun()" style="cursor:pointer">Copy Consumer Secret</button>
 				</td>
 			</tr>
 			
@@ -219,4 +180,23 @@
 	</div>
 </script>
 
-
+<script>
+	function app_key_copy_fun() {
+		var app_key_copy = document.getElementById( "app_key" );
+		var btn_text_app = document.querySelector( '#app_key + button' );
+		navigator.clipboard.writeText( app_key_copy.value );
+		btn_text_app.innerHTML = 'copied';
+	}
+	function consumer_copy_fun() {
+		var consumer_copy = document.getElementById( "key_consumer_key" );
+		var btn_text_key = document.querySelector( '#key_consumer_key + button' );
+		navigator.clipboard.writeText( consumer_copy.value );
+		btn_text_key.innerHTML = 'copied';
+	}
+	function secret_copy_fun() {
+		var secret_copy = document.getElementById( "key_consumer_secret" );
+		var btn_text_secret = document.querySelector( '#key_consumer_secret + button' );
+		navigator.clipboard.writeText( secret_copy.value );
+		btn_text_secret.innerHTML = 'copied';
+	}
+</script>
\ No newline at end of file
diff --git a/admin/templates/wpem-rest-settings-panel.php b/admin/templates/wpem-rest-settings-panel.php
index 8e064c6..91b14b3 100644
--- a/admin/templates/wpem-rest-settings-panel.php
+++ b/admin/templates/wpem-rest-settings-panel.php
@@ -1,206 +1,172 @@
 <?php
 wp_enqueue_style('wp-color-picker');
 
-$tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'general';
-$tab_settings =  isset($this->settings[$tab]) ? $this->settings[$tab] : array();?>
+$tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
+$tab_settings =  isset( $this->settings[$tab] ) ? $this->settings[$tab] : array();?>
 <div class="wpem-admin-bottom-content">
   <?php
-    if(isset($tab_settings['type']) &&  $tab_settings['type'] == 'template') {
-
-        if(isset($tab) && file_exists(__DIR__. '/wpem-rest-settings-'.$tab.'.php') ) {
+    if( isset( $tab_settings['type'] ) &&  $tab_settings['type'] == 'template' ) {
+        if(isset( $tab ) && file_exists( __DIR__. '/wpem-rest-settings-'.$tab.'.php' ) ) {
             include 'wpem-rest-settings-'.$tab.'.php';
+        } else {
+            _e( 'Setting template file not exists', 'wpem-rest-api' );
         }
-        else {
-            _e('Setting template file not exists', 'wpem-rest-api');
-        }
-        
     }
-    else if($tab_settings['type'] == 'fields' && isset($tab_settings['fields']) && isset($tab_settings['sections'])) {
+    else if( $tab_settings['type'] == 'fields' && isset( $tab_settings['fields'] ) && isset( $tab_settings['sections'] ) ) {
         foreach ( $tab_settings['sections'] as $section_key => $section ) {
       
             echo '<h3 class="wpem-admin-tab-title">'. esc_html($section).'</h3>';
             echo '<div class="wpem-admin-body">';
             echo '<table class="form-table">';
 
-            if(isset($tab_settings['fields'][$section_key])) {
+            if( isset( $tab_settings['fields'][$section_key] ) ) {
                 foreach ( $tab_settings['fields'][$section_key] as $option ) {
 
-                      $placeholder    = ( ! empty($option['placeholder']) ) ? 'placeholder="' . $option['placeholder'] . '"' : '';
-
-                      $class          = ! empty($option['class']) ? $option['class'] : '';
-
-                      $value          = get_option($option['name']);
-
-                      $option['type'] = ! empty($option['type']) ? $option['type'] : '';
-
-                      $attributes     = array();
-
-                    if (! empty($option['attributes']) && is_array($option['attributes']) ) {
-
+                    $placeholder    = ( !empty( $option['placeholder'] ) ) ? 'placeholder="' . $option['placeholder'] . '"' : '';
+                    $class          = !empty( $option['class'] ) ? $option['class'] : '';
+                    $value          = get_option( $option['name'] );
+                    $option['type'] = !empty( $option['type'] ) ? $option['type'] : '';
+                    $attributes     = array();
+                    if (!empty( $option['attributes'] ) && is_array( $option['attributes'] ) ) {
                         foreach ( $option['attributes'] as $attribute_name => $attribute_value ) {
-
-                            $attributes[] = esc_attr($attribute_name) . '="' . esc_attr($attribute_value) . '"';
+                            $attributes[] = esc_attr( $attribute_name ) . '="' . esc_attr( $attribute_value ) . '"';
                         }
                     }
 
-                      echo '<tr valign="top" class="' . esc_attr($class) . '"><th scope="row"><label for="setting-' . esc_attr($option['name']) . '">' . esc_attr($option['label']) . '</a></th><td>';
-
-                      switch ( $option['type'] ) {
-
-                    case "checkbox" :
-
-                        ?><label><input id="setting-<?php echo esc_attr($option['name']); ?>" name="<?php echo esc_attr($option['name']); ?>" type="checkbox" value="1" <?php echo implode(' ', $attributes); ?> <?php checked('1', $value); ?> /> <?php echo esc_html($option['cb_label']); ?></label><?php
-
-if ($option['desc'] ) {
-
-    echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-}
+                    echo '<tr valign="top" class="' . esc_attr($class) . '"><th scope="row"><label for="setting-' . esc_attr($option['name']) . '">' . esc_attr($option['label']) . '</a></th><td>';
 
+                    switch ( $option['type'] ) {
+                        case "checkbox" : ?>
+                            <label>
+                                <input id="setting-<?php echo esc_attr( $option['name'] ); ?>" name="<?php echo esc_attr( $option['name'] ); ?>" type="checkbox" value="1" <?php echo implode( ' ', $attributes ); ?> <?php checked( '1', $value ); ?> />
+                                <?php echo esc_html( $option['cb_label'] ); ?>
+                            </label>
+                        <?php
+                            if ( $option['desc'] ) {
+                                echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
+                            }
                         break;
-
-                    case "textarea" :
-
-                        ?><textarea id="setting-<?php echo esc_attr($option['name']); ?>" class="large-text" cols="50" rows="3" name="<?php echo esc_attr($option['name']); ?>" <?php echo implode(' ', $attributes); ?> <?php echo esc_html($placeholder); ?>><?php echo esc_textarea($value); ?></textarea><?php
-
-if ($option['desc'] ) {
-
-    echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-}
-
+                    case "textarea" : ?>
+                        <textarea id="setting-<?php echo esc_attr( $option['name'] ); ?>" class="large-text" cols="50" rows="3" name="<?php echo esc_attr($option['name']); ?>" <?php echo implode( ' ', $attributes ); ?> <?php echo esc_html( $placeholder ); ?>>
+                            <?php echo esc_textarea( $value ); ?>
+                        </textarea>
+                        <?php
+                        if ( $option['desc'] ) {
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
+                        }
                         break;
-
-                    case "select" :
-
-                        ?><select id="setting-<?php echo esc_attr($option['name']); ?>" class="regular-text" name="<?php echo esc_attr($option['name']); ?>" <?php echo implode(' ', $attributes); ?>><?php
-
-foreach( $option['options'] as $key => $name ) {
-
-    echo '<option value="' . esc_attr($key) . '" ' . selected($value, $key, false) . '>' . esc_html($name) . '</option>';
-}
-
-?></select><?php
-
-if ($option['desc'] ) {
-
-    echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-
-}
-
+                    case "select" : ?>
+                        <select id="setting-<?php echo esc_attr( $option['name'] ); ?>" class="regular-text" name="<?php echo esc_attr( $option['name'] ); ?>" <?php echo implode( ' ', $attributes ); ?>>
+                            <?php
+                            foreach( $option['options'] as $key => $name ) {
+                                echo '<option value="' . esc_attr($key) . '" ' . selected($value, $key, false) . '>' . esc_html($name) . '</option>';
+                            } ?>
+                        </select>
+                        <?php
+                        if ( $option['desc'] ) {
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
+                        }
                         break;
-                    case "radio":
-                        ?><fieldset>
-              <legend class="screen-reader-text">
-                <span><?php echo esc_html($option['label']); ?></span>
-              </legend><?php
-
-                if ($option['desc'] ) {
-                    echo '<p class="description">' . esc_html_e($option['desc']) . '</p>';
-                }
-
-                foreach( $option['options'] as $key => $name ) {
-                    echo '<label><input name="' . esc_attr($option['name']) . '" type="radio" value="' . esc_attr($key) . '" ' . checked($value, $key, false) . ' />' . esc_html($name) . '</label><br>';
-                }
-
-                ?></fieldset><?php
-
+                    case "radio": ?>
+                        <fieldset>
+                            <legend class="screen-reader-text">
+                                <span><?php echo esc_html( $option['label'] ); ?></span>
+                            </legend>
+                            <?php
+                            if ( $option['desc'] ) {
+                                echo '<p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
+                            }
+                            foreach( $option['options'] as $key => $name ) {
+                                echo '<label><input name="' . esc_attr( $option['name'] ) . '" type="radio" value="' . esc_attr( $key ) . '" ' . checked( $value, $key, false ) . ' />' . esc_html( $name ) . '</label><br>';
+                            } ?>
+                        </fieldset>
+                        <?php
                         break;
-
                     case "page" :
-
                         $args = array(
-
-                        'name'             => $option['name'],
-
-                        'id'               => $option['name'],
-
-                        'sort_column'      => 'menu_order',
-
-                        'sort_order'       => 'ASC',
-
-                        'show_option_none' => __('--no page--', 'wp-event-manager'),
-
-                        'echo'             => false,
-
-                        'selected'         => absint($value)
-
+                            'name'             => $option['name'],
+                            'id'               => $option['name'],
+                            'sort_column'      => 'menu_order',
+                            'sort_order'       => 'ASC',
+                            'show_option_none' => __('--no page--', 'wp-event-manager'),
+                            'echo'             => false,
+                            'selected'         => absint($value)
                         );
-
-                        echo str_replace(' id=', " data-placeholder='" . __('Select a page&hellip;', 'wp-event-manager') .  "' id=", wp_dropdown_pages($args));
-
+                        echo str_replace(' id=', " data-placeholder='" . __( 'Select a page&hellip;', 'wp-event-manager' ) .  "' id=", wp_dropdown_pages( $args ));
                         if ($option['desc'] ) {
-
-                            echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
                         }
-            
                         break;
-
-                    case "password" :
-
-                        ?><input id="setting-<?php echo esc_attr($option['name']); ?>" class="regular-text" type="password" name="<?php echo esc_attr($option['name']); ?>" value="<?php esc_attr_e($value); ?>" <?php echo implode(' ', $attributes); ?> <?php echo $placeholder; ?> /><?php
-
-if ($option['desc'] ) {
-
-    echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-}
-
+                    case "password" : ?>
+                        <input id="setting-<?php echo esc_attr( $option['name'] ); ?>" class="regular-text" type="password" name="<?php echo esc_attr( $option['name'] ); ?>" value="<?php esc_attr_e( $value ); ?>" <?php echo implode( ' ', $attributes ); ?> <?php echo $placeholder; ?> />
+                        <?php
+                        if ( $option['desc'] ) {
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
+                        }
                         break;
-
                     case "" :
-
                     case "input" :
-
                     case "text" :
-
-                        ?><input id="setting-<?php echo esc_attr($option['name']); ?>" class="regular-text" type="text" name="<?php echo esc_attr($option['name']); ?>" value="<?php esc_attr_e($value); ?>" <?php echo implode(' ', $attributes); ?> <?php echo $placeholder; ?> /><?php
-
-                        if ($option['desc'] ) {
-
-                            echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
+                        $default_name = 'WP Event Manager';
+                        $current_name = get_option( 'wpem_rest_api_app_name', $default_name );
+                        if (empty($current_name)) {
+                            update_option( 'wpem_rest_api_app_name', 'WP Event Manager' );
+                            $current_name = $default_name;
+                        }; ?>
+                        <input id="setting-<?php echo esc_attr( $option['name'] ); ?>" class="regular-text" type="text" name="<?php echo esc_attr( $option['name'] ); ?>" value="<?php esc_attr_e( $current_name ); ?>" <?php echo implode( ' ', $attributes ); ?> <?php echo $placeholder; ?> />
+                        <?php
+                        if ( $option['desc'] ) {
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
                         }
-
                         break;    
-          
                     case "multi-select-checkbox":
-                        $this->create_multi_select_checkbox($option);
+                        $this->create_multi_select_checkbox( $option );
                         break;
-                    case "color-picker":
-                        ?><input id="setting-<?php echo esc_attr($option['name']); ?>" class="regular-text wpem-colorpicker" type="text" name="<?php echo esc_attr($option['name']); ?>" value="<?php esc_attr_e($value); ?>" <?php echo implode(' ', $attributes); ?> <?php echo $placeholder; ?> /><?php
-
-if ($option['desc'] ) {
-
-    echo ' <p class="description">' . esc_html_e($option['desc']) . '</p>';
-}
+                    case "color-picker": ?>
+                        <input id="setting-<?php echo esc_attr( $option['name'] ); ?>" class="regular-text wpem-colorpicker" type="text" name="<?php echo esc_attr( $option['name'] ); ?>" value="<?php esc_attr_e( $value ); ?>" <?php echo implode( ' ', $attributes ); ?> <?php echo $placeholder; ?> /><?php
+                        if ( $option['desc'] ) {
+                            echo ' <p class="description">' . esc_html_e( $option['desc'] ) . '</p>';
+                        }
                         break;
-                    case "file" :
-                        ?>
-            <p class="form-field">
-                        <?php
-                        if (! empty($option['multiple']) ) {
-                            foreach ( (array) $option['value'] as $value ) {
-                                ?><span class="file_url"><input type="text" name="<?php echo esc_attr($option['name']); ?>[]" placeholder="<?php echo esc_attr($option['cb_label']); ?>" value="<?php echo esc_attr($value); ?>" /><button class="button button-small wp_event_manager_upload_file_button" data-uploader_button_text="<?php _e('Use file', 'wpem-rest-api'); ?>"><?php _e('Upload', 'wpem-rest-api'); ?></button></span><?php
+                    case "file" : ?>
+                        <p class="form-field">
+                            <?php
+                            if ( !empty( $option['multiple'] ) ) {
+                                foreach ( (array) $option['value'] as $value ) { ?>
+                                    <span class="file_url">
+                                        <input type="text" name="<?php echo esc_attr( $option['name'] ); ?>[]" placeholder="<?php echo esc_attr( $option['cb_label'] ); ?>" value="<?php echo esc_attr( $value ); ?>" />
+                                        <button class="button button-small wp_event_manager_upload_file_button" data-uploader_button_text="<?php _e( 'Use file', 'wpem-rest-api'); ?>">
+                                            <?php _e( 'Upload', 'wpem-rest-api' ); ?>
+                                        </button>
+                                    </span>
+                                <?php
+                                }
+                            } else {
+                                if(isset($option['value']) && is_array($option['value']) ) {
+                                }  ?>
+                                <span class="file_url">
+                                    <input type="text" name="<?php echo esc_attr( $option['name'] ); ?>" id="<?php echo esc_attr( $option['name'] ); ?>" placeholder="<?php echo esc_attr( $option['cb_label'] ); ?>" value="<?php echo esc_attr( $value ); ?>" />
+                                    <button class="button button-small wp_event_manager_upload_file_button" data-uploader_button_text="<?php _e( 'Use file', 'wpem-rest-api' ); ?>">
+                                        <?php _e( 'Upload', 'wpem-rest-api' ); ?>
+                                    </button>
+                                </span>
+                                <?php
                             }
-                        } else {
-                            if(isset($option['value']) && is_array($option['value']) ) {
-                            }                ?><span class="file_url"><input type="text" name="<?php echo esc_attr($option['name']); ?>" id="<?php echo esc_attr($option['name']); ?>" placeholder="<?php echo esc_attr($option['cb_label']); ?>" value="<?php echo esc_attr($value); ?>" /><button class="button button-small wp_event_manager_upload_file_button" data-uploader_button_text="<?php _e('Use file', 'wpem-rest-api'); ?>"><?php _e('Upload', 'wpem-rest-api'); ?></button></span><?php
-                        }
-                        if (! empty($option['multiple']) ) {
-                            ?><button class="button button-small wp_event_manager_add_another_file_button" data-field_name="<?php echo esc_attr($key); ?>" data-field_placeholder="<?php echo esc_attr($option['cb_label']); ?>" data-uploader_button_text="<?php _e('Use file', 'wpem-rest-api'); ?>" data-uploader_button="<?php _e('Upload', 'wpem-rest-api'); ?>"><?php _e('Add file', 'wpem-rest-api'); ?></button><?php
-                        }
-                        ?>
-            </p>
+                            if( !empty( $option['multiple'] ) ) { ?>
+                                <button class="button button-small wp_event_manager_add_another_file_button" data-field_name="<?php echo esc_attr($key); ?>" data-field_placeholder="<?php echo esc_attr( $option['cb_label'] ); ?>" data-uploader_button_text="<?php _e( 'Use file', 'wpem-rest-api' ); ?>" data-uploader_button="<?php _e( 'Upload', 'wpem-rest-api' ); ?>">
+                                    <?php _e( 'Add file', 'wpem-rest-api' ); ?>
+                                </button>
+                            <?php
+                            } ?>
+                        </p>
                         <?php
                     default :
-
                         do_action('wp_event_manager_admin_field_' . $option['type'], $option, $attributes, $value, $placeholder);
-
                         break;
-
-                      }
+                    }
                 }
             }
             echo '</td></tr></table></div>';
         }
-    }
-    ?>
-</div>
+    } ?>
+</div>
\ No newline at end of file
diff --git a/admin/wpem-rest-api-admin.php b/admin/wpem-rest-api-admin.php
index 86a7823..e5cd31d 100644
--- a/admin/wpem-rest-api-admin.php
+++ b/admin/wpem-rest-api-admin.php
@@ -1,7 +1,7 @@
 <?php
 defined('ABSPATH') || exit;
 /**
- * WPEM_Rest_API_Admin class.
+ * WPEM_Rest_API_Admin class used to create rest api tab in wp event manager plugin.
  */
 class WPEM_Rest_API_Admin{
     /**
@@ -37,25 +37,22 @@ public function __construct(){
      */
 
     public function admin_enqueue_scripts(){
-
-        if(isset($_GET['page']) && $_GET['page'] == 'wpem-rest-api-settings' ) {
+        if( isset( $_GET['page']) && $_GET['page'] == 'wpem-rest-api-settings' ) {
 
             wp_enqueue_media();
 
-            wp_register_script('wpem-rest-api-admin-js', WPEM_REST_API_PLUGIN_URL. '/assets/js/admin.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'wp-util','wp-color-picker'), WPEM_REST_API_VERSION, true);
-
+            wp_register_script( 'wpem-rest-api-admin-js', WPEM_REST_API_PLUGIN_URL. '/assets/js/admin.min.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'wp-util','wp-color-picker' ), WPEM_REST_API_VERSION, true );
             wp_localize_script(
                 'wpem-rest-api-admin-js', 'wpem_rest_api_admin', array(            
-                'ajaxUrl' => admin_url('admin-ajax.php'),
-                'save_api_nonce' =>  wp_create_nonce('save-api-key'),
-                'save_app_branding_nonce' =>  wp_create_nonce('save-api-branding'),
+                    'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+                    'save_api_nonce' =>  wp_create_nonce( 'save-api-key' ),
+                    'save_app_branding_nonce' =>  wp_create_nonce( 'save-api-branding' ),
                 ) 
             );
 
-            wp_enqueue_style('jquery-ui');  
-            wp_enqueue_style('jquery-ui-style', EVENT_MANAGER_PLUGIN_URL. '/assets/js/jquery-ui/jquery-ui.min.css', array());
+            wp_enqueue_style( 'jquery-ui' );  
+            wp_enqueue_style( 'jquery-ui-style', EVENT_MANAGER_PLUGIN_URL. '/assets/js/jquery-ui/jquery-ui.min.css', array() );
         }
-
     }
 
     /**
@@ -65,8 +62,7 @@ public function admin_enqueue_scripts(){
      * @access public
      * @return void
      */
-    public function wpem_rest_api_add_admin_screen($screen_ids){
-        
+    public function wpem_rest_api_add_admin_screen( $screen_ids ){
         $screen_ids[]='event_listing_page_wpem-rest-api-settings';
         return $screen_ids;
     }    
@@ -79,7 +75,7 @@ public function wpem_rest_api_add_admin_screen($screen_ids){
      * @return void
      */
     public function admin_menu(){
-        add_submenu_page('edit.php?post_type=event_listing', __('Rest API Settings', 'wpem-rest-api'), __('Rest API', 'wpem-rest-api'), 'manage_options', 'wpem-rest-api-settings', array( $this->settings_page, 'output' ));
+        add_submenu_page( 'edit.php?post_type=event_listing', __( 'Rest API Settings', 'wpem-rest-api' ), __( 'Rest API', 'wpem-rest-api' ), 'manage_options', 'wpem-rest-api-settings', array( $this->settings_page, 'output' ) );
     }
 
     /**
@@ -93,113 +89,104 @@ public  function update_api_key(){
         global $wpdb;
 
         check_ajax_referer('save-api-key', 'security');
-
         $response = array();
-
         try {
-            if (empty($_POST['description']) ) {
-                throw new Exception(__('Description is missing.', 'wpem-rest-api'));
+            if( empty( $_POST['description'] ) ) {
+                throw new Exception( __( 'Description is missing.', 'wpem-rest-api' ) );
             }
-            if (empty($_POST['user']) ) {
-                throw new Exception(__('User is missing.', 'wpem-rest-api'));
+            if( empty($_POST['user']) ) {
+                throw new Exception( __( 'User is missing.', 'wpem-rest-api' ) );
             }
-            if (empty($_POST['permissions']) ) {
-                throw new Exception(__('Permissions is missing.', 'wpem-rest-api'));
+            if( empty($_POST['permissions']) ) {
+                throw new Exception( __( 'Permissions is missing.', 'wpem-rest-api' ) );
             }
 
-            $key_id      = isset($_POST['key_id']) ? absint($_POST['key_id']) : 0;
-            $description = sanitize_text_field(wp_unslash($_POST['description']));
-            $permissions = ( in_array(wp_unslash($_POST['permissions']), array( 'read', 'write', 'read_write' ), true) ) ? sanitize_text_field(wp_unslash($_POST['permissions'])) : 'read';
-            $user_id      = absint($_POST['user']);
-            $event_id     = !empty($_POST['event_id']) ?  absint($_POST['event_id']) : '' ;
-            $date_expires = !empty($_POST['date_expires']) ?  date('Y-m-d H:i:s', strtotime(str_replace('-', '/', $_POST['date_expires']))) : null ;
+            $key_id      = isset( $_POST['key_id'] ) ? absint( $_POST['key_id'] ) : 0;
+            $description = sanitize_text_field( wp_unslash( $_POST['description'] ) );
+            $permissions = ( in_array( wp_unslash( $_POST['permissions'] ), array( 'read', 'write', 'read_write' ), true ) ) ? sanitize_text_field( wp_unslash( $_POST['permissions'] ) ) : 'read';
+            $user_id      = absint( $_POST['user'] );
+            $event_id     = !empty( $_POST['event_id'] ) ?  absint( $_POST['event_id'] ) : '' ;
+            $date_expires = !empty( $_POST['date_expires'] ) ?  date( 'Y-m-d H:i:s', strtotime( str_replace( '-', '/', $_POST['date_expires'] ) ) ) : null ;
 
             // Check if current user can edit other users.
-            if ($user_id && ! current_user_can('edit_user', $user_id) ) {
-                if (get_current_user_id() !== $user_id ) {
-                    throw new Exception(__('You do not have permission to assign API Keys to the selected user.', 'wpem-rest-api'));
+            if( $user_id && ! current_user_can( 'edit_user', $user_id ) ) {
+                if( get_current_user_id() !== $user_id ) {
+                    throw new Exception( __( 'You do not have permission to assign API Keys to the selected user.', 'wpem-rest-api' ) );
                 }
             }
 
-            if (0 < $key_id ) {
+            if( 0 < $key_id ) {
                 $data = array(
-                'user_id'             => $user_id,
-                'description'         => $description,
-                'permissions'         => $permissions,
-                'event_id'               => $event_id,
-                'date_expires'           => $date_expires,
+                    'user_id'      => $user_id,
+                    'description'  => $description,
+                    'permissions'  => $permissions,
+                    'event_id'     => $event_id,
+                    'date_expires' => $date_expires,
                 );
 
                 $wpdb->update(
                     $wpdb->prefix . 'wpem_rest_api_keys',
                     $data,
                     array( 'key_id' => $key_id ),
-                    array(
-                    '%d',
-                    '%s',
-                    '%s',
-                    '%d',
-                    '%s',
-                        
-                    ),
+                        array(
+                            '%d',
+                            '%s',
+                            '%s',
+                            '%d',
+                            '%s',
+                        ),
                     array( '%d' )
                 );
-
                 $response                    = $data;
                 $response['consumer_key']    = '';
                 $response['consumer_secret'] = '';
-                $response['message']         = __('API Key updated successfully.', 'wpem-rest-api');
+                $response['message']         = __( 'API Key updated successfully.', 'wpem-rest-api' );
             } else {
                 $app_key = wp_rand();
                 $consumer_key    = 'ck_' . sha1(wp_rand());
                 $consumer_secret = 'cs_' . sha1(wp_rand());
 
                 $data = array(
-                'user_id'         => $user_id,
-                'app_key'         => $app_key,
-                'description'     => $description,
-                'permissions'     => $permissions,
-                'event_id'           => $event_id,
-                'consumer_key'    =>  $consumer_key ,
-                'consumer_secret' => $consumer_secret,
-                'truncated_key'   => substr($consumer_key, -7),
-                'date_created'    => current_time('mysql') ,
-                'date_expires'    => $date_expires,
+                    'user_id'         => $user_id,
+                    'app_key'         => $app_key,
+                    'description'     => $description,
+                    'permissions'     => $permissions,
+                    'event_id'        => $event_id,
+                    'consumer_key'    => $consumer_key ,
+                    'consumer_secret' => $consumer_secret,
+                    'truncated_key'   => substr($consumer_key, -7),
+                    'date_created'    => current_time( 'mysql' ) ,
+                    'date_expires'    => $date_expires,
                 );
-
                 $wpdb->insert(
                     $wpdb->prefix . 'wpem_rest_api_keys',
                     $data,
                     array(
-                    '%d',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
-                    '%s',
+                        '%d',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
+                        '%s',
                     )
                 );
-
                 $key_id                      = $wpdb->insert_id;
                 $response                    = $data;
                 $response['consumer_key']    = $consumer_key;
                 $response['consumer_secret'] = $consumer_secret;
-                $response['app_key']          = $app_key;
-                $response['message']         = __('API Key generated successfully. Make sure to copy your new keys now as the secret key will be hidden once you leave this page.', 'wpem-rest-api');
-                $response['revoke_url']      = '<a class="wpem-backend-theme-button wpem-revoke-button" href="' . esc_url(wp_nonce_url(add_query_arg(array( 'revoke-key' => $key_id ), admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access')), 'revoke')) . '">' . __('Revoke key', 'wpem-rest-api') . '</a>';
+                $response['app_key']         = $app_key;
+                $response['message']         = __( 'API Key generated successfully. Make sure to copy your new keys now as the secret key will be hidden once you leave this page.', 'wpem-rest-api' );
+                $response['revoke_url']      = '<a class="wpem-backend-theme-button" href="' . esc_url( admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' ) ) . '">' . __('I have Copied the Keys', 'wpem-rest-api') . '</a> <br/><br/> <a class="wpem-backend-theme-button wpem-revoke-button" href="' . esc_url(wp_nonce_url(add_query_arg(array( 'revoke-key' => $key_id ), admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access')), 'revoke')) . '">' . __('Revoke key', 'wpem-rest-api') . '</a>';
             }
         } catch ( Exception $e ) {
-            wp_send_json_error(array( 'message' => $e->getMessage() ));
+            wp_send_json_error( array( 'message' => $e->getMessage() ) );
         }
-
         // wp_send_json_success must be outside the try block not to break phpunit tests.
         wp_send_json_success($response);
     }
-
-    
 }
 new WPEM_Rest_API_Admin();
\ No newline at end of file
diff --git a/admin/wpem-rest-api-keys-table-list.php b/admin/wpem-rest-api-keys-table-list.php
index ac1b039..3e2f8a6 100644
--- a/admin/wpem-rest-api-keys-table-list.php
+++ b/admin/wpem-rest-api-keys-table-list.php
@@ -1,35 +1,29 @@
 <?php
-/**
- * WPEM API Keys Table List
- *
- * @version 1.0.0
- */
-
 defined('ABSPATH') || exit;
 
-if (! class_exists('WP_List_Table') ) {
+if ( !class_exists( 'WP_List_Table' ) ) {
     include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
- * API Keys table list class.
+ * API Keys table list class for wp rest api.
  */
-class WPEM_API_Keys_Table_List extends WP_List_Table{
+class WPEM_API_Keys_Table_List extends WP_List_Table {
 
     /**
      * Initialize the API key table list.
      */
-    public function __construct(){
+    public function __construct() {
         parent::__construct(
-            array('ajax'      => false   )
+            array( 'ajax' => false )
         );
     }
 
     /**
      * No items found text.
      */
-    public function no_items(){
-        esc_html_e('No keys found.', 'wpem-rest-api');
+    public function no_items() {
+        esc_html_e( 'No keys found.', 'wpem-rest-api' );
     }
 
     /**
@@ -38,60 +32,57 @@ public function no_items(){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_cb( $key ){
-        return sprintf('<input type="checkbox" name="key[]" value="%1$s" />', $key['key_id']);
+    public function column_cb( $key ) {
+        return sprintf( '<input type="checkbox" name="key[]" value="%1$s" />', $key['key_id'] );
     }
 
-    public function column_default($item, $column_name){
+    public function column_default( $item, $column_name ) {
         return $item[$column_name];
     }
 
-    public function get_hidden_columns(){
+    public function get_hidden_columns() {
         return array();
     }
 
     /**
      * Get list columns.
-     *
      * @return array
      */
-    public function get_columns(){
+    public function get_columns() {
         return array(
         'cb'            => '<input type="checkbox" />',
-        'app_key'          => __('App Key', 'wpem-rest-api'),
-        'title'         => __('Description', 'wpem-rest-api'),
-        'truncated_key' => __('Consumer key ending in', 'wpem-rest-api'),
-        'user_id'          => __('User', 'wpem-rest-api'),
-        'event_id'          => __('Event', 'wpem-rest-api'),
-             
-        'permissions'   => __('Permissions', 'wpem-rest-api'),
-        'last_access'   => __('Last access', 'wpem-rest-api'),
+        'app_key'       => __( 'App Key', 'wpem-rest-api' ),
+        'title'         => __( 'Description', 'wpem-rest-api' ),
+        'truncated_key' => __( 'Consumer key ending in', 'wpem-rest-api' ),
+        'user_id'       => __( 'User', 'wpem-rest-api' ),
+        'event_id'      => __( 'Event', 'wpem-rest-api' ),
+        'permissions'   => __( 'Permissions', 'wpem-rest-api' ),
+        'last_access'   => __( 'Last access', 'wpem-rest-api' ),
         );
     }
 
     /**
      * Return title column.
-     *
      * @param  array $key Key data.
      * @return string
      */
-    public function column_title( $key ){
-        $url     =  admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&edit-key=' . $key['key_id']);
-        $user_id = intval($key['user_id']);
+    public function column_title( $key ) {
+        $url     =  admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&edit-key=' . $key['key_id'] );
+        $user_id = intval( $key['user_id'] );
 
         // Check if current user can edit other users or if it's the same user.
-        $can_edit = current_user_can('edit_user', $user_id) || get_current_user_id() === $user_id;
+        $can_edit = current_user_can( 'edit_user', $user_id ) || get_current_user_id() === $user_id;
 
         $output = '<strong>';
-        if ($can_edit ) {
-            $output .= '<a href="' . esc_url($url) . '" class="row-title">';
+        if ( $can_edit ) {
+            $output .= '<a href="' . esc_url( $url ) . '" class="row-title">';
         }
-        if (empty($key['description']) ) {
+        if (empty( $key['description'] ) ) {
             $output .= esc_html__('API key', 'wpem-rest-api');
         } else {
-            $output .= esc_html($key['description']);
+            $output .= esc_html( $key['description'] );
         }
-        if ($can_edit ) {
+        if ( $can_edit ) {
             $output .= '</a>';
         }
         $output .= '</strong>';
@@ -99,31 +90,30 @@ public function column_title( $key ){
         // Get actions.
         $actions = array(
         /* translators: %s: API key ID. */
-        'id' => sprintf(__('ID: %d', 'wpem-rest-api'), $key['key_id']),
+        'id' => sprintf( __( 'ID: %d', 'wpem-rest-api' ), $key['key_id'] ),
         );
 
         if ($can_edit ) {
-            $actions['edit']  = '<a href="' . esc_url($url) . '">' . __('View/Edit', 'wpem-rest-api') . '</a>';
-            $actions['trash'] = '<a class="submitdelete" aria-label="' . esc_attr__('Revoke API key', 'wpem-rest-api') . '" href="' . esc_url(
+            $actions['edit']  = '<a href="' . esc_url( $url ) . '">' . __( 'View/Edit', 'wpem-rest-api' ) . '</a>';
+            $actions['trash'] = '<a class="submitdelete" aria-label="' . esc_attr__( 'Revoke API key', 'wpem-rest-api' ) . '" href="' . esc_url(
                 wp_nonce_url(
                     add_query_arg(
                         array(
-                        'revoke-key' => $key['key_id'],
+                            'revoke-key' => $key['key_id'],
                         ),
-                        admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access')
+                        admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' )
                     ),
                     'revoke'
                 )
-            ) . '">' . esc_html__('Revoke', 'wpem-rest-api') . '</a>';
+            ) . '">' . esc_html__( 'Revoke', 'wpem-rest-api' ) . '</a>';
         }
 
         $row_actions = array();
-
         foreach ( $actions as $action => $link ) {
-            $row_actions[] = '<span class="' . esc_attr($action) . '">' . $link . '</span>';
+            $row_actions[] = '<span class="' . esc_attr( $action ) . '">' . $link . '</span>';
         }
 
-        $output .= '<div class="row-actions">' . implode(' | ', $row_actions) . '</div>';
+        $output .= '<div class="row-actions">' . implode( ' | ', $row_actions ) . '</div>';
 
         return $output;
     }
@@ -134,7 +124,7 @@ public function column_title( $key ){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_truncated_key( $key ){
+    public function column_truncated_key( $key ) {
         return '<code>&hellip;' . esc_html($key['truncated_key']) . '</code>';
     }
 
@@ -144,18 +134,17 @@ public function column_truncated_key( $key ){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_user_id( $key ){
-        $user = get_user_by('id', $key['user_id']);
-
-        if (! $user ) {
+    public function column_user_id( $key ) {
+        $user = get_user_by( 'id', $key['user_id'] );
+        if ( !$user ) {
             return '';
         }
 
-        if (current_user_can('edit_user', $user->ID) ) {
-            return '<a href="' . esc_url(add_query_arg(array( 'user_id' => $user->ID ), admin_url('user-edit.php'))) . '">' . esc_html($user->display_name) . '</a>';
+        if ( current_user_can( 'edit_user', $user->ID ) ) {
+            return '<a href="' . esc_url( add_query_arg( array( 'user_id' => $user->ID ), admin_url( 'user-edit.php' ) ) ) . '">' . esc_html( $user->display_name ) . '</a>';
         }
 
-        return esc_html($user->display_name);
+        return esc_html( $user->display_name );
     }
 
     /**
@@ -164,9 +153,9 @@ public function column_user_id( $key ){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_event_id( $key ){
-        if(!empty($key['event_id'])) {
-            return '<a href="'.esc_url(admin_url('post.php?post=' . $key['event_id']) . '&action=edit').'" />'.get_the_title($key['event_id']).'</a>';
+    public function column_event_id( $key ) {
+        if( !empty( $key['event_id'] ) ) {
+            return '<a href="'.esc_url( admin_url( 'post.php?post=' . $key['event_id'] ) . '&action=edit' ).'" />'.get_the_title( $key['event_id'] ).'</a>';
         }
         return;
     }
@@ -176,16 +165,16 @@ public function column_event_id( $key ){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_permissions( $key ){
+    public function column_permissions( $key ) {
         $permission_key = $key['permissions'];
         $permissions    = array(
-        'read'       => __('Read', 'wpem-rest-api'),
-        'write'      => __('Write', 'wpem-rest-api'),
-        'read_write' => __('Read/Write', 'wpem-rest-api'),
+            'read'       => __( 'Read', 'wpem-rest-api' ),
+            'write'      => __( 'Write', 'wpem-rest-api' ),
+            'read_write' => __( 'Read/Write', 'wpem-rest-api' ),
         );
 
-        if (isset($permissions[ $permission_key ]) ) {
-            return esc_html($permissions[ $permission_key ]);
+        if ( isset( $permissions[ $permission_key ] ) ) {
+            return esc_html( $permissions[ $permission_key ] );
         } else {
             return '';
         }
@@ -197,15 +186,13 @@ public function column_permissions( $key ){
      * @param  array $key Key data.
      * @return string
      */
-    public function column_last_access( $key ){
-        if (! empty($key['last_access']) ) {
+    public function column_last_access( $key ) {
+        if ( !empty( $key['last_access'] ) ) {
             /* translators: 1: last access date 2: last access time */
-            $date = sprintf(__('%1$s at %2$s', 'wpem-rest-api'), date_i18n('Y-m-d', strtotime($key['last_access'])), date_i18n('H:s:i', strtotime($key['last_access'])));
-
-            return apply_filters('wpem_api_key_last_access_datetime', $date, $key['last_access']);
+            $date = sprintf( __( '%1$s at %2$s', 'wpem-rest-api' ), date_i18n( 'Y-m-d', strtotime( $key['last_access'])), date_i18n( 'H:s:i', strtotime( $key['last_access'] ) ) );
+            return apply_filters( 'wpem_api_key_last_access_datetime', $date, $key['last_access'] );
         }
-
-        return __('Unknown', 'wpem-rest-api');
+        return __( 'Unknown', 'wpem-rest-api' );
     }
 
     /**
@@ -213,30 +200,29 @@ public function column_last_access( $key ){
      *
      * @return array
      */
-    public function get_bulk_actions(){
-        if (! current_user_can('remove_users') ) {
+    public function get_bulk_actions() {
+        if ( !current_user_can( 'remove_users' ) ) {
             return array();
         }
-
         return array(
-        'revoke' => __('Revoke', 'wpem-rest-api'),
+            'revoke' => __( 'Revoke', 'wpem-rest-api' ),
         );
     }
 
     /**
      * Prepare table list items.
      */
-    public function prepare_items(){
+    public function prepare_items() {
         global $wpdb;
 
-        $per_page     = $this->get_items_per_page('10');
+        $per_page     = $this->get_items_per_page( '10' );
         $current_page = $this->get_pagenum();
 
         $columns = $this->get_columns();
         $hidden = $this->get_hidden_columns();
         $sortable = $this->get_sortable_columns();
 
-        if (1 < $current_page ) {
+        if( 1 < $current_page ) {
             $offset = $per_page * ( $current_page - 1 );
         } else {
             $offset = 0;
@@ -244,27 +230,27 @@ public function prepare_items(){
 
         $search = '';
 
-        if (! empty($_REQUEST['s']) ) { // WPCS: input var okay, CSRF ok.
-            $search = "AND description LIKE '%" . esc_sql($wpdb->esc_like(wp_unslash($_REQUEST['s']))) . "%' "; // WPCS: input var okay, CSRF ok.
+        if( !empty( $_REQUEST['s'] ) ) { // WPCS: input var okay, CSRF ok.
+            $search = "AND description LIKE '%" . esc_sql( $wpdb->esc_like( wp_unslash( $_REQUEST['s'] ) ) ) . "%' "; // WPCS: input var okay, CSRF ok.
         }
 
         // Get the API keys.
         $keys = $wpdb->get_results(
-            "SELECT key_id,app_key, user_id, event_id, description, permissions, truncated_key, last_access FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1 {$search}" .
-            $wpdb->prepare('ORDER BY key_id DESC LIMIT %d OFFSET %d;', $per_page, $offset),
+            "SELECT key_id, app_key, user_id, event_id, description, permissions, truncated_key, last_access FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1 {$search}" .
+            $wpdb->prepare( 'ORDER BY key_id DESC LIMIT %d OFFSET %d;', $per_page, $offset ),
             ARRAY_A
         ); // WPCS: unprepared SQL ok.
 
-        $count = $wpdb->get_var("SELECT COUNT(key_id) FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1 {$search};"); // WPCS: unprepared SQL ok.
-        $this->_column_headers = array($columns, $hidden, $sortable);
+        $count = $wpdb->get_var( "SELECT COUNT(key_id) FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1 {$search};"); // WPCS: unprepared SQL ok.
+        $this->_column_headers = array( $columns, $hidden, $sortable );
         $this->items = $keys;
 
         // Set the pagination.
         $this->set_pagination_args(
             array(
-            'total_items' => $count,
-            'per_page'    => $per_page,
-            'total_pages' => ceil($count / $per_page),
+                'total_items' => $count,
+                'per_page'    => $per_page,
+                'total_pages' => ceil( $count / $per_page ),
             )
         );
     }
@@ -275,18 +261,18 @@ public function prepare_items(){
      * @param string $text     Button text.
      * @param string $input_id Input ID.
      */
-    public function search_box( $text, $input_id ){
-        if (empty($_REQUEST['s']) && ! $this->has_items() ) { // WPCS: input var okay, CSRF ok.
+    public function search_box( $text, $input_id ) {
+        if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) { // WPCS: input var okay, CSRF ok.
             return;
         }
 
         $input_id     = $input_id . '-search-input';
-        $search_query = isset($_REQUEST['s']) ? sanitize_text_field(wp_unslash($_REQUEST['s'])) : ''; // WPCS: input var okay, CSRF ok.
+        $search_query = isset( $_REQUEST['s'] ) ? sanitize_text_field( wp_unslash($_REQUEST['s'] ) ) : ''; // WPCS: input var okay, CSRF ok.
 
         echo '<div class="wpem-admin-body">';
         echo '<p class="search-box">';
-        echo '<label class="screen-reader-text" for="' . esc_attr($input_id) . '">' . esc_html($text) . ':</label>';
-        echo '<input type="search" id="' . esc_attr($input_id) . '" name="s" value="' . esc_attr($search_query) . '" />';
+        echo '<label class="screen-reader-text" for="' . esc_attr( $input_id ) . '">' . esc_html( $text ) . ':</label>';
+        echo '<input type="search" id="' . esc_attr( $input_id ) . '" name="s" value="' . esc_attr( $search_query ) . '" />';
         submit_button(
             $text,
             '',
@@ -297,7 +283,5 @@ public function search_box( $text, $input_id ){
             )
         );
         echo '</p>';
-        
     }
-
-}
+}
\ No newline at end of file
diff --git a/admin/wpem-rest-api-keys.php b/admin/wpem-rest-api-keys.php
index b0dba2c..2917116 100644
--- a/admin/wpem-rest-api-keys.php
+++ b/admin/wpem-rest-api-keys.php
@@ -1,23 +1,16 @@
 <?php
-/**
- * WPEM Admin API Keys Class
- *
- * @version 1.0.0
- */
-
 defined('ABSPATH') || exit;
 
 /**
- * WPEM_Rest_API_Keys.
+ * WPEM_Rest_API_Keys class used to show rest api key list table.
  */
-class WPEM_Rest_API_Keys{
+class WPEM_Rest_API_Keys {
 
     /**
      * Initialize the API Keys admin actions.
      */
     public function __construct(){
-        add_action('admin_init', array( $this, 'actions' ));
-        //add_action( 'wp_event_manager_admin_field_wp-table', array( $this, 'screen_option' ) );
+        add_action( 'admin_init', array( $this, 'actions' ) );
     }
 
     /**
@@ -27,8 +20,8 @@ public function __construct(){
      * @param  bool $allow If allow save settings.
      * @return bool
      */
-    public function allow_save_settings( $allow ){
-        if (! isset($_GET['create-key'], $_GET['edit-key']) ) { // WPCS: input var okay, CSRF ok.
+    public function allow_save_settings( $allow ) {
+        if( !isset( $_GET['create-key'], $_GET['edit-key'] ) ) { // WPCS: input var okay, CSRF ok.
             return false;
         }
 
@@ -40,8 +33,8 @@ public function allow_save_settings( $allow ){
      *
      * @return bool
      */
-    private function is_api_keys_settings_page(){
-        return isset($_GET['page']) &&  'wpem-rest-api-settings' === $_GET['page'] ; // WPCS: input var okay, CSRF ok.
+    private function is_api_keys_settings_page() {
+        return isset( $_GET['page'] ) &&  'wpem-rest-api-settings' === $_GET['page'] ; // WPCS: input var okay, CSRF ok.
     }
 
     /**
@@ -50,21 +43,19 @@ private function is_api_keys_settings_page(){
     public static function page_output(){
         // Hide the save button.
         $GLOBALS['hide_save_button'] = true;
-        wp_enqueue_script('wpem-rest-api-admin-js');
+        wp_enqueue_script( 'wpem-rest-api-admin-js' );
 
-
-        if (isset($_GET['create-key']) || isset($_GET['edit-key']) ) {
+        if( isset( $_GET['create-key'] ) || isset( $_GET['edit-key'] ) ) {
         
-            $key_id   = isset($_GET['edit-key']) ? absint($_GET['edit-key']) : 0; // WPCS: input var okay, CSRF ok.
-            $key_data = self::get_key_data($key_id);
+            $key_id   = isset( $_GET['edit-key'] ) ? absint( $_GET['edit-key'] ) : 0; // WPCS: input var okay, CSRF ok.
+            $key_data = self::get_key_data( $key_id );
             $user_id  = (int) $key_data['user_id'];
 
-            if ($key_id && $user_id && ! current_user_can('edit_user', $user_id) ) {
-                if (get_current_user_id() !== $user_id ) {
-                    wp_die(esc_html__('You do not have permission to edit this API Key', 'wpem-rest-api'));
+            if ( $key_id && $user_id && ! current_user_can( 'edit_user', $user_id ) ) {
+                if ( get_current_user_id() !== $user_id ) {
+                    wp_die( esc_html__( 'You do not have permission to edit this API Key', 'wpem-rest-api' ) );
                 }
             }
-            
             include dirname(__FILE__) . '/templates/html-keys-edit.php';
         } else {
             self::table_list_output();
@@ -74,54 +65,51 @@ public static function page_output(){
     /**
      * Add screen option.
      */
-    public function screen_option(){
+    public function screen_option() {
         global $keys_table_list;
 
-        if (! isset($_GET['create-key']) && ! isset($_GET['edit-key']) && $this->is_api_keys_settings_page() ) { // WPCS: input var okay, CSRF ok.
+        if( !isset( $_GET['create-key'] ) && !isset( $_GET['edit-key'] ) && $this->is_api_keys_settings_page() ) { // WPCS: input var okay, CSRF ok.
             $keys_table_list = new WPEM_API_Keys_Table_List();
 
             // Add screen option.
             add_screen_option(
                 'per_page',
                 array(
-                'default' => 10,
-                'option'  => 10,
+                    'default' => 10,
+                    'option'  => 10,
                 )
             );
         }
-
         self::page_output();
     }
 
     /**
      * Table list output.
      */
-    private static function table_list_output(){
+    private static function table_list_output() {
         global $wpdb, $keys_table_list;
 
         $keys_table_list = new WPEM_API_Keys_Table_List();
 
-        echo '<h3 class="wpem-admin-tab-title">' . esc_html__('REST API', 'wpem-rest-api') . ' <a href="' . esc_url(admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&create-key=1')) . '" class="add-new-h2 wpem-backend-theme-button">' . esc_html__('Add Key', 'wpem-rest-api') . '</a></h3>';
+        echo '<h3 class="wpem-admin-tab-title">' . esc_html__( 'REST API', 'wpem-rest-api' ) . ' <a href="' . esc_url( admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&create-key=1' ) ) . '" class="add-new-h2 wpem-backend-theme-button">' . esc_html__( 'Add Key', 'wpem-rest-api' ) . '</a></h3>';
 
         // Get the API keys count.
-        $count = $wpdb->get_var("SELECT COUNT(key_id) FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1;");
+        $count = $wpdb->get_var( "SELECT COUNT(key_id) FROM {$wpdb->prefix}wpem_rest_api_keys WHERE 1 = 1;" );
 
         if (absint($count) && $count > 0 ) {
             $keys_table_list->prepare_items();
-            
             $keys_table_list->views();
-            $keys_table_list->search_box(__('Search key', 'wp-event-manager-organizer-app-access'), 'key');
+            $keys_table_list->search_box(__( 'Search key', 'wp-event-manager-organizer-app-access' ), 'key' );
             $keys_table_list->display();
 
         } else {
-            echo '<div class="wpem-rest-api-BlankState wpem-rest-api-BlankState--api wpem-admin-body">';
-            ?>
+            echo '<div class="wpem-rest-api-BlankState wpem-rest-api-BlankState--api wpem-admin-body">'; ?>
             <div class="wpem-no-api-wrap">
                 <div class="wpem-no-api-icon">
                     <span class="dashicons dashicons-cloud-saved"></span>
                 </div>
-            <h2 class="wpem-rest-api-BlankState-message"><?php esc_html_e('Enable and generate Rest API keys.', 'wpem-rest-api'); ?></h2>
-            <a class="wpem-rest-api-BlankState-cta button-primary wpem-backend-theme-button button" href="<?php echo esc_url(admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&create-key=1')); ?>"><?php esc_html_e('Create an API key', 'wpem-rest-api'); ?></a>
+            <h2 class="wpem-rest-api-BlankState-message"><?php esc_html_e( 'Enable and generate Rest API keys.', 'wpem-rest-api' ); ?></h2>
+            <a class="wpem-rest-api-BlankState-cta button-primary wpem-backend-theme-button button" href="<?php echo esc_url(admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access&create-key=1' ) ); ?>"><?php esc_html_e( 'Create an API key', 'wpem-rest-api' ); ?></a>
             </div>
             <style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }</style>
             <?php
@@ -139,17 +127,17 @@ private static function get_key_data( $key_id ){
         global $wpdb;
 
         $empty = array(
-        'key_id'        => 0,
-        'user_id'       => '',
-        'event_id'       => '',
-        'description'   => '',
-        'permissions'   => '',
-        'truncated_key' => '',
-        'last_access'   => '',
-        'date_expires' => '',
+            'key_id'        => 0,
+            'user_id'       => '',
+            'event_id'      => '',
+            'description'   => '',
+            'permissions'   => '',
+            'truncated_key' => '',
+            'last_access'   => '',
+            'date_expires'  => '',
         );
 
-        if (0 === $key_id ) {
+        if ( 0 === $key_id ) {
             return $empty;
         }
 
@@ -163,7 +151,7 @@ private static function get_key_data( $key_id ){
             ARRAY_A
         );
 
-        if (is_null($key) ) {
+        if ( is_null( $key ) ) {
             return $empty;
         }
 
@@ -173,15 +161,15 @@ private static function get_key_data( $key_id ){
     /**
      * API Keys admin actions.
      */
-    public function actions(){
-        if ($this->is_api_keys_settings_page() ) {
+    public function actions() {
+        if ( $this->is_api_keys_settings_page() ) {
             // Revoke key.
-            if (isset($_REQUEST['revoke-key']) ) { // WPCS: input var okay, CSRF ok.
+            if( isset( $_REQUEST['revoke-key'] ) ) { // WPCS: input var okay, CSRF ok.
                 $this->revoke_key();
             }
 
             // Bulk actions.
-            if (isset($_REQUEST['action']) && isset($_REQUEST['key']) ) { // WPCS: input var okay, CSRF ok.
+            if( isset( $_REQUEST['action'] ) && isset($_REQUEST['key'] ) ) { // WPCS: input var okay, CSRF ok.
                 $this->bulk_actions();
             }
         }
@@ -190,12 +178,12 @@ public function actions(){
     /**
      * Notices.
      */
-    public static function notices(){
-        if (isset($_GET['revoked']) ) { // WPCS: input var okay, CSRF ok.
-            $revoked = absint($_GET['revoked']); // WPCS: input var okay, CSRF ok.
+    public static function notices() {
+        if( isset( $_GET['revoked'] ) ) { // WPCS: input var okay, CSRF ok.
+            $revoked = absint( $_GET['revoked'] ); // WPCS: input var okay, CSRF ok.
 
             /* translators: %d: count */
-            sprintf(_n('%d API key permanently revoked.', '%d API keys permanently revoked.', $revoked, 'wpem-rest-api'), $revoked);
+            sprintf( _n( '%d API key permanently revoked.', '%d API keys permanently revoked.', $revoked, 'wpem-rest-api' ), $revoked );
         }
     }
 
@@ -204,38 +192,37 @@ public static function notices(){
      */
     private function revoke_key(){
         global $wpdb;
-
         check_admin_referer('revoke');
 
-        if (isset($_REQUEST['revoke-key']) ) { // WPCS: input var okay, CSRF ok.
-            $key_id  = absint($_REQUEST['revoke-key']); // WPCS: input var okay, CSRF ok.
-            $user_id = (int) $wpdb->get_var($wpdb->prepare("SELECT user_id FROM {$wpdb->prefix}wpem_rest_api_keys WHERE key_id = %d", $key_id));
+        if ( isset( $_REQUEST['revoke-key'] ) ) { // WPCS: input var okay, CSRF ok.
+            $key_id  = absint( $_REQUEST['revoke-key'] ); // WPCS: input var okay, CSRF ok.
+            $user_id = (int) $wpdb->get_var($wpdb->prepare( "SELECT user_id FROM {$wpdb->prefix}wpem_rest_api_keys WHERE key_id = %d", $key_id ) );
 
-            if ($key_id && $user_id && ( current_user_can('edit_user', $user_id) || get_current_user_id() === $user_id ) ) {
-                $this->remove_key($key_id);
+            if ( $key_id && $user_id && ( current_user_can( 'edit_user', $user_id ) || get_current_user_id() === $user_id ) ) {
+                $this->remove_key( $key_id );
             } else {
-                wp_die(esc_html__('You do not have permission to revoke this API Key', 'wpem-rest-api'));
+                wp_die( esc_html__( 'You do not have permission to revoke this API Key', 'wpem-rest-api' ) );
             }
         }
 
-        wp_safe_redirect(esc_url_raw(add_query_arg(array( 'revoked' => 1 ), admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access'))));
+        wp_safe_redirect( esc_url_raw( add_query_arg( array( 'revoked' => 1 ), admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' ) ) ) );
         exit();
     }
 
     /**
      * Bulk actions.
      */
-    private function bulk_actions(){
-        if (! current_user_can('manage_options') ) {
-            wp_die(esc_html__('You do not have permission to edit API Keys', 'wpem-rest-api'));
+    private function bulk_actions() {
+        if( !current_user_can( 'manage_options' ) ) {
+            wp_die( esc_html__( 'You do not have permission to edit API Keys', 'wpem-rest-api' ) );
         }
 
-        if (isset($_REQUEST['action']) ) { // WPCS: input var okay, CSRF ok.
-            $action = sanitize_text_field(wp_unslash($_REQUEST['action'])); // WPCS: input var okay, CSRF ok.
-            $keys   = isset($_REQUEST['key']) ? array_map('absint', (array) $_REQUEST['key']) : array(); // WPCS: input var okay, CSRF ok.
+        if ( isset( $_REQUEST['action'] ) ) { // WPCS: input var okay, CSRF ok.
+            $action = sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ); // WPCS: input var okay, CSRF ok.
+            $keys   = isset( $_REQUEST['key'] ) ? array_map( 'absint', (array) $_REQUEST['key']) : array(); // WPCS: input var okay, CSRF ok.
 
-            if ('revoke' === $action ) {
-                $this->bulk_revoke_key($keys);
+            if ( 'revoke' === $action ) {
+                $this->bulk_revoke_key( $keys );
             }
         }
     }
@@ -245,22 +232,21 @@ private function bulk_actions(){
      *
      * @param array $keys API Keys.
      */
-    private function bulk_revoke_key( $keys ){
-        if (! current_user_can('remove_users') ) {
-            wp_die(esc_html__('You do not have permission to revoke API Keys', 'wpem-rest-api'));
+    private function bulk_revoke_key( $keys ) {
+        if( !current_user_can( 'remove_users' ) ) {
+            wp_die( esc_html__( 'You do not have permission to revoke API Keys', 'wpem-rest-api' ) );
         }
 
         $qty = 0;
         foreach ( $keys as $key_id ) {
-            $result = $this->remove_key($key_id);
-
-            if ($result ) {
+            $result = $this->remove_key( $key_id);
+            if( $result ) {
                 $qty++;
             }
         }
 
         // Redirect to webhooks page.
-        wp_safe_redirect(esc_url_raw(add_query_arg(array( 'revoked' => $qty ), admin_url('edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access'))));
+        wp_safe_redirect( esc_url_raw( add_query_arg( array( 'revoked' => $qty ), admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' ) ) ) );
         exit();
     }
 
@@ -270,13 +256,10 @@ private function bulk_revoke_key( $keys ){
      * @param  int $key_id API Key ID.
      * @return bool
      */
-    private function remove_key( $key_id ){
+    private function remove_key( $key_id ) {
         global $wpdb;
-
-        $delete = $wpdb->delete($wpdb->prefix . 'wpem_rest_api_keys', array( 'key_id' => $key_id ), array( '%d' ));
-
+        $delete = $wpdb->delete( $wpdb->prefix . 'wpem_rest_api_keys', array( 'key_id' => $key_id ), array( '%d' ) );
         return $delete;
     }
 }
-
-new WPEM_Rest_API_Keys();
+new WPEM_Rest_API_Keys();
\ No newline at end of file
diff --git a/admin/wpem-rest-api-settings.php b/admin/wpem-rest-api-settings.php
index 480ee67..39ca42c 100644
--- a/admin/wpem-rest-api-settings.php
+++ b/admin/wpem-rest-api-settings.php
@@ -1,97 +1,90 @@
 <?php
-/*
-* This file use for settings at admin site for wp event manager plugin.
-*/
-
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 /**
- * WPEM_Rest_API_Settings class.
+ * WPEM_Rest_API_Settings class used to create settings fields and save settings.
  */
-
 class WPEM_Rest_API_Settings {
 
 	public $settings;
-
 	/**
 	 * __construct function.
-	 *
 	 * @access public
 	 * @return void
 	 */
 
 	public function __construct() {
-
 		$this->settings_group = 'wpem_rest_api';
 		add_action( 'admin_init', array( $this, 'register_settings' ) );
 	}
 
 	/**
 	 * init_settings function.
-	 *
 	 * @access public
 	 * @return void
 	 */
 	public function init_settings() {
-
 		$this->settings = apply_filters( 'wpem_rest_api_settings',
-
 			array(
-					'general' => array(
-							'label'			=>	__( 'General', 'wpem-rest-api' ),
-							'icon'			=>	'meter',
-							'type'       => 'fields',
-							'sections'		=> array(
-									'general' => __('General Settings','wpem-rest-api'),
+				'general' => array(
+					'label'	   => __( 'General', 'wpem-rest-api' ),
+					'icon'	   => 'meter',
+					'type'     => 'fields',
+					'sections' => array(
+						'general' => __('General Settings','wpem-rest-api'),
+					), 
+					'fields' => array(
+						'general' => array(
+							array(
+								'name'       => 'enable_wpem_rest_api',
+								'std'        => '1',
+								'label'      => __( 'Enable Rest API', 'wpem-rest-api' ),
+								'cb_label'   => __( 'Disable to remove the API functionality from your event website.', 'wpem-rest-api' ),
+								'desc'       => '',
+								'type'       => 'checkbox',
+								'attributes' => array(),
 							),
-							'fields'		=> array(
-									'general' => array(
-											array(
-												'name'       => 'enable_wpem_rest_api',
-												'std'        => '1',
-												'label'      => __( 'Enable Rest API', 'wpem-rest-api' ),
-												'cb_label'   => __( 'Disable to remove the API functionality from your event website.', 'wpem-rest-api' ),
-												'desc'       => '',
-												'type'       => 'checkbox',
-												'attributes' => array(),
-											),
-
-											array(
-												'name'       => 'wpem_rest_api_app_logo',
-												'std'        => '',
-												'cb_label'   => __( 'Upload  the logo of your own brand.', 'wpem-rest-api' ),
-												'label'      => __( 'App Logo', 'wpem-rest-api' ),
-												'desc'       => __( 'Upload smallest file possible to ensure lesser loading time', 'wpem-rest-api' ),
-												'type'       => 'file',
-
-												'attributes' => array(),
-											),
-
-									),
-							)
-					),
-					'api-access' => array(
-							'label'			=>	__( 'API Access', 'wpem-rest-api' ),
-							'icon'			=>	'loop',
-							'type'       => 'template',
-					),
-					'app-branding' => array(
-							'label'			=>	__( 'APP Branding', 'wpem-rest-api' ),
-							'icon'			=>	'mobile',
-							'type'       	=> 'template',
-					),
+							array(
+								'name'       => 'wpem_rest_api_app_name',
+								'std'        => 'WP Event Manager',
+								'label'      => __( 'Application Name', 'wpem-rest-api' ),
+								'cb_label'   => __( 'WP Event Manager', 'wpem-rest-api' ),
+								'desc'       => '',
+								'type'       => 'text',
+								'attributes' => array(),
+							),
+							array(
+								'name'       => 'wpem_rest_api_app_logo',
+								'std'        => '',
+								'cb_label'   => __( 'Upload  the logo of your own brand.', 'wpem-rest-api' ),
+								'label'      => __( 'App Logo', 'wpem-rest-api' ),
+								'desc'       => __( 'Upload smallest file possible to ensure lesser loading time', 'wpem-rest-api' ),
+								'type'       => 'file',
+								'attributes' => array(),
+							),
+						),
+					)
+				),
+				'api-access' => array(
+					'label'	=>	__( 'API Access', 'wpem-rest-api' ),
+					'icon'	=>	'loop',
+					'type'  => 'template',
+				),
+				'app-branding' => array(
+					'label'	=>	__( 'APP Branding', 'wpem-rest-api' ),
+					'icon'	=>	'mobile',
+					'type'  => 'template',
+				),
 			)
 		);
 	}
 
 	/**
 	 * register_settings function.
-	 *
 	 * @access public
 	 * @return void
 	 */
 	public function register_settings() {
-
 		$this->init_settings();
 
 		foreach($this->settings as $settings ){
@@ -100,7 +93,6 @@ public function register_settings() {
 
 	      		if(isset($settings['fields'][$section_key]))
 		      	foreach ( $settings['fields'][$section_key] as $option ) {
-
 		      		if(isset($option['name']) && isset($option['std']) )
 		      			add_option( $option['name'], $option['std'] );
 
@@ -111,14 +103,11 @@ public function register_settings() {
 	}
 
 	/**
-	 * output function.
-	 *
+	 * output function used to display setting fields at backend side in settings.
 	 * @access public
 	 * @return void
 	 */
-
 	public function output() {
-
 		$this->init_settings();
 
 		wp_enqueue_style( 'wpem-rest-api-backend', WPEM_REST_API_PLUGIN_URL.'/assets/css/backend.min.css' );
@@ -129,51 +118,45 @@ public function output() {
 		$action = '';
 		if(in_array($current_tab, ['general'])){
 			$action = 'action=options.php';
-		}?>
+		} ?>
 		<div class="wrap">
         	<h1><?php _e( 'Rest API Settings', 'wpem-rest-api' ); ?></h1>
     	</div>
 
 		<div id="wpbody" role="main">
-		  <div id="wpbody-content" class="wpem-admin-container">
-
-		    <div class="wpem-wrap">
-				<form method="post" name="wpem-rest-settings-form" <?php echo esc_attr($action); ?> >
-
-					<?php settings_fields( $this->settings_group ); ?>
-
-					<div class="wpem-admin-left-sidebar">
-				        <ul class="wpem-admin-left-menu">
-
-				        	<?php foreach ( $this->settings as $key => $section ) { ?>
-				          <li class="wpem-admin-left-menu-item">
-				            <a class="wpem-icon-<?php echo isset($section['icon']) ? esc_attr($section['icon']) : 'meter';?> nav-tab <?php if ( isset( $_GET['tab'] ) && ( $_GET['tab'] == $key )  ) echo 'nav-tab-active'; ?>" href="<?php echo  esc_url( admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab='.$key ) );?>"><?php echo esc_html( $section['label'] ) ;?></a>
-				          </li>
-				       		<?php } ?>
-				        </ul>
-				      </div>
-				      <div class="wpem-admin-right-container wpem-<?php echo esc_html($current_tab); ?> wpem-app-branding-mode wpem-light-mode">
-				      	<div class="metabox-holder wpem-admin-right-container-holder">
-				          <div class="wpem-admin-top-title-section postbox">
-				          	<?php
-                                if (!empty($_GET['settings-updated'])) {
-                                    flush_rewrite_rules();
-                                    echo '<div class="updated fade event-manager-updated"><p>' . __( 'Settings successfully saved', 'wpem-rest-api' ) . '</p></div>';
-                                }	
-				                  include('templates/wpem-rest-settings-panel.php');
-				             ?>
-						  </div>
-						  <p class="submit">
-								<input type="submit" class="button-primary wpem-backend-theme-button" id="save-changes" value="<?php _e( 'Save Changes', 'wpem-rest-api' ); ?>" />
-						  </p>
+		  	<div id="wpbody-content" class="wpem-admin-container">
+		    	<div class="wpem-wrap">
+					<form method="post" name="wpem-rest-settings-form" <?php echo esc_attr($action); ?> >
+
+						<?php settings_fields( $this->settings_group ); ?>
+						<div class="wpem-admin-left-sidebar">
+							<ul class="wpem-admin-left-menu">
+								<?php foreach ( $this->settings as $key => $section ) { ?>
+									<li class="wpem-admin-left-menu-item">
+										<a class="wpem-icon-<?php echo isset($section['icon']) ? esc_attr($section['icon']) : 'meter';?> nav-tab <?php if ( isset( $_GET['tab'] ) && ( $_GET['tab'] == $key )  ) echo 'nav-tab-active'; ?>" href="<?php echo  esc_url( admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab='.$key ) );?>"><?php echo esc_html( $section['label'] ) ;?></a>
+									</li>
+								<?php } ?>
+							</ul>
 						</div>
-
-				      </div>
-
-			    </form>
-		    </div>
-		 </div>
+						<div class="wpem-admin-right-container wpem-<?php echo esc_html($current_tab); ?> wpem-app-branding-mode wpem-light-mode">
+							<div class="metabox-holder wpem-admin-right-container-holder">
+								<div class="wpem-admin-top-title-section postbox">
+									<?php
+										if (!empty($_GET['settings-updated'])) {
+											flush_rewrite_rules();
+											echo '<div class="updated fade event-manager-updated"><p>' . __( 'Settings successfully saved', 'wpem-rest-api' ) . '</p></div>';
+										}	
+										include('templates/wpem-rest-settings-panel.php'); ?>
+								</div>
+								<p class="submit">
+										<input type="submit" class="button-primary wpem-backend-theme-button" id="save-changes" value="<?php _e( 'Save Changes', 'wpem-rest-api' ); ?>" />
+								</p>
+							</div>
+						</div>
+			    	</form>
+		    	</div>
+		 	</div>
 		</div>
-		<?php  wp_enqueue_script( 'wp-event-manager-admin-settings');
+		<?php wp_enqueue_script( 'wp-event-manager-admin-settings');
 	}
-}
+}
\ No newline at end of file
diff --git a/admin/wpem-rest-app-branding.php b/admin/wpem-rest-app-branding.php
index f204d30..a8b3096 100644
--- a/admin/wpem-rest-app-branding.php
+++ b/admin/wpem-rest-app-branding.php
@@ -1,25 +1,18 @@
 <?php
-/**
- * WPEM Admin API Keys Class
- *
- * @version 1.0.0
- */
-
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
 /**
- * WPEM_Rest_APP_Branding.
+ * WPEM_Rest_APP_Branding class would be used for set app branding parameters like colors of app.
  */
-class WPEM_Rest_APP_Branding{
+class WPEM_Rest_APP_Branding {
 
     /**
      * Initialize the API Keys admin actions.
      */
     public function __construct(){
         // Ajax
-        add_action('wp_ajax_change_brighness_color', array( $this, 'change_brighness_color' ));
-
-        add_action("wp_ajax_save_app_branding", array($this, "save_app_branding"));
+        add_action( 'wp_ajax_change_brighness_color', array( $this, 'change_brighness_color' ) );
+        add_action( "wp_ajax_save_app_branding", array( $this, "save_app_branding" ) );
     }
 
     /**
@@ -28,25 +21,23 @@ public function __construct(){
     public static function page_output(){
         // Hide the save button.
         $GLOBALS['hide_save_button'] = true;
-        wp_enqueue_script('wpem-rest-api-admin-js');
-
-        $primary_color     = !empty(get_option('wpem_primary_color')) ? get_option('wpem_primary_color') : '#3366FF';
-        $success_color     = !empty(get_option('wpem_success_color')) ? get_option('wpem_success_color') : '#77DD37';
-        $info_color     = !empty(get_option('wpem_info_color')) ? get_option('wpem_info_color') : '#42BCFF';
-        $warning_color     = !empty(get_option('wpem_warning_color')) ? get_option('wpem_warning_color') : '#FCD837';
-        $danger_color     = !empty(get_option('wpem_danger_color')) ? get_option('wpem_danger_color') : '#FC4C20';
+        wp_enqueue_script( 'wpem-rest-api-admin-js' );
 
+        $primary_color = !empty( get_option( 'wpem_primary_color' ) ) ? get_option( 'wpem_primary_color' ) : '#3366FF';
+        $success_color = !empty( get_option( 'wpem_success_color' ) ) ? get_option( 'wpem_success_color' ) : '#77DD37';
+        $info_color    = !empty( get_option( 'wpem_info_color' ) ) ? get_option( 'wpem_info_color' ) : '#42BCFF';
+        $warning_color = !empty( get_option( 'wpem_warning_color' ) ) ? get_option( 'wpem_warning_color' ) : '#FCD837';
+        $danger_color  = !empty( get_option( 'wpem_danger_color' ) ) ? get_option( 'wpem_danger_color' ) : '#FC4C20';
 
-        $primary_dark_color     = !empty(get_option('wpem_primary_dark_color')) ? get_option('wpem_primary_dark_color') : '#3366FF';
-        $success_dark_color     = !empty(get_option('wpem_success_dark_color')) ? get_option('wpem_success_dark_color') : '#77DD37';
-        $info_dark_color     = !empty(get_option('wpem_info_dark_color')) ? get_option('wpem_info_dark_color') : '#42BCFF';
-        $warning_dark_color     = !empty(get_option('wpem_warning_dark_color')) ? get_option('wpem_warning_dark_color') : '#FCD837';
-        $danger_dark_color     = !empty(get_option('wpem_danger_dark_color')) ? get_option('wpem_danger_dark_color') : '#FC4C20';
+        $primary_dark_color = !empty( get_option( 'wpem_primary_dark_color' ) ) ? get_option( 'wpem_primary_dark_color' ) : '#3366FF';
+        $success_dark_color = !empty( get_option( 'wpem_success_dark_color' ) ) ? get_option( 'wpem_success_dark_color' ) : '#77DD37';
+        $info_dark_color    = !empty( get_option( 'wpem_info_dark_color' ) ) ? get_option( 'wpem_info_dark_color' ) : '#42BCFF';
+        $warning_dark_color = !empty( get_option( 'wpem_warning_dark_color' ) ) ? get_option( 'wpem_warning_dark_color' ) : '#FCD837';
+        $danger_dark_color  = !empty( get_option( 'wpem_danger_dark_color' ) ) ? get_option( 'wpem_danger_dark_color' ) : '#FC4C20';
 
         include dirname(__FILE__) . '/templates/html-app-branding.php';
     }
 
-
     /**
      * change brighness color
      *
@@ -55,164 +46,152 @@ public static function page_output(){
      */
     public function change_brighness_color() {
         $output = '';
-        if(isset($_REQUEST['color']) && !empty($_REQUEST['color']) ) {
+        if( isset( $_REQUEST['color'] ) && !empty( $_REQUEST['color'] ) ) {
             $color_code = sanitize_hex_color($_REQUEST['color']);
 
-            for($i=1;$i<10;$i++){
+            for( $i = 1; $i < 10; $i++ ) {
 
-                $brightness = (1000 - $i*100) ;
+                $brightness = ( 1000 - $i*100 ) ;
                 $adjust_percentage = $i/10;
 
-                if($brightness == 500) {
+                if( $brightness == 500 ) {
                     $adjust_percentage = 0;
                 }
 
                 $code = wpem_rest_api_color_brightness($color_code, $adjust_percentage);
-
-                if($i < 5) {
+                if ( $i < 5 ) {
                     $output .= '<div class="wpem-color-pallet-wrapper"><div>'. $brightness .'</div> <div class="wpem-color-pallet" style="background-color:'.$code.'" data-color-code="'.$code.'"><span style="color:#fff">'.$code.'</span></div></div>';
-                }else{
+                } else {
                     $output .= '<div class="wpem-color-pallet-wrapper"><div>'. $brightness .'</div> <div class="wpem-color-pallet" style="background-color:'.$code.'" data-color-code="'.$code.'"><span style="color:'.$code.'">'.$code.'</span></div></div>';
                 }
             }
         }
-
         echo esc_attr($output);
         wp_die();
     }
 
     /**
      * save app branding tab data
-     *
      * @param  int $key_id API Key ID.
      * @return bool
      */
     public function save_app_branding(){
 
-        check_ajax_referer('save-api-branding', 'security');
+        check_ajax_referer( 'save-api-branding', 'security' );
 
         //normal colors
-        if(isset($_POST['wpem_primary_color'])) {
-            update_option('wpem_primary_color', sanitize_hex_color($_POST['wpem_primary_color']));
+        if( isset( $_POST['wpem_primary_color'] ) ) {
+            update_option( 'wpem_primary_color', sanitize_hex_color($_POST['wpem_primary_color'] ) );
         }
 
-        if(isset($_POST['wpem_success_color'])) {
-            update_option('wpem_success_color', sanitize_hex_color($_POST['wpem_success_color']));
+        if( isset( $_POST['wpem_success_color'] ) ) {
+            update_option( 'wpem_success_color', sanitize_hex_color($_POST['wpem_success_color'] ) );
         }
 
-        if(isset($_POST['wpem_info_color'])) {
-            update_option('wpem_info_color', sanitize_hex_color($_POST['wpem_info_color']));
+        if( isset( $_POST['wpem_info_color'] ) ) {
+            update_option( 'wpem_info_color', sanitize_hex_color($_POST['wpem_info_color'] ) );
         }
 
-        if(isset($_POST['wpem_warning_color'])) {
-            update_option('wpem_warning_color', sanitize_hex_color($_POST['wpem_warning_color']));
+        if( isset( $_POST['wpem_warning_color'] ) ) {
+            update_option( 'wpem_warning_color', sanitize_hex_color($_POST['wpem_warning_color'] ) );
         }
 
-        if(isset($_POST['wpem_danger_color'])) {
-            update_option('wpem_danger_color', sanitize_hex_color($_POST['wpem_danger_color']));
+        if( isset( $_POST['wpem_danger_color'] ) ) {
+            update_option( 'wpem_danger_color', sanitize_hex_color($_POST['wpem_danger_color'] ) );
         }
 
-        $primary_color     = !empty(get_option('wpem_primary_color')) ? get_option('wpem_primary_color') : '#3366FF';
-        $success_color     = !empty(get_option('wpem_success_color')) ? get_option('wpem_success_color') : '#77DD37';
-        $info_color     = !empty(get_option('wpem_info_color')) ? get_option('wpem_info_color') : '#42BCFF';
-        $warning_color     = !empty(get_option('wpem_warning_color')) ? get_option('wpem_warning_color') : '#FCD837';
-        $danger_color     = !empty(get_option('wpem_danger_color')) ? get_option('wpem_danger_color') : '#FC4C20';
+        $primary_color = !empty( get_option( 'wpem_primary_color' ) ) ? get_option( 'wpem_primary_color' ) : '#3366FF';
+        $success_color = !empty( get_option( 'wpem_success_color' ) ) ? get_option( 'wpem_success_color' ) : '#77DD37';
+        $info_color    = !empty( get_option( 'wpem_info_color' ) ) ? get_option( 'wpem_info_color' ) : '#42BCFF';
+        $warning_color = !empty( get_option( 'wpem_warning_color' ) ) ? get_option( 'wpem_warning_color' ) : '#FCD837';
+        $danger_color  = !empty( get_option( 'wpem_danger_color' ) ) ? get_option( 'wpem_danger_color' ) : '#FC4C20';
 
         //dark mode colors
-        if(isset($_POST['wpem_primary_dark_color'])) {
-            update_option('wpem_primary_dark_color', sanitize_hex_color($_POST['wpem_primary_dark_color']));
+        if( isset( $_POST['wpem_primary_dark_color'] ) ) {
+            update_option( 'wpem_primary_dark_color', sanitize_hex_color($_POST['wpem_primary_dark_color'] ) );
         }
 
-        if(isset($_POST['wpem_success_dark_color'])) {
-            update_option('wpem_success_dark_color', sanitize_hex_color($_POST['wpem_success_dark_color']));
+        if( isset( $_POST['wpem_success_dark_color'] ) ) {
+            update_option( 'wpem_success_dark_color', sanitize_hex_color($_POST['wpem_success_dark_color'] ) );
         }
 
-        if(isset($_POST['wpem_info_dark_color'])) {
-            update_option('wpem_info_dark_color', sanitize_hex_color($_POST['wpem_info_dark_color']));
+        if( isset( $_POST['wpem_info_dark_color'] ) ) {
+            update_option( 'wpem_info_dark_color', sanitize_hex_color($_POST['wpem_info_dark_color'] ) );
         }
 
-        if(isset($_POST['wpem_warning_dark_color'])) {
-            update_option('wpem_warning_dark_color', sanitize_hex_color($_POST['wpem_warning_dark_color']));
+        if( isset( $_POST['wpem_warning_dark_color'] ) ) {
+            update_option( 'wpem_warning_dark_color', sanitize_hex_color($_POST['wpem_warning_dark_color'] ) );
         }
 
-        if(isset($_POST['wpem_danger_dark_color'])) {
-            update_option('wpem_danger_dark_color', sanitize_hex_color($_POST['wpem_danger_dark_color']));
+        if( isset( $_POST['wpem_danger_dark_color'] ) ) {
+            update_option( 'wpem_danger_dark_color', sanitize_hex_color($_POST['wpem_danger_dark_color'] ) );
         }
-        $primary_dark_color     = !empty(get_option('wpem_primary_dark_color')) ? get_option('wpem_primary_dark_color') : '#3366FF';
-        $success_dark_color     = !empty(get_option('wpem_success_dark_color')) ? get_option('wpem_success_dark_color') : '#77DD37';
-        $info_dark_color     = !empty(get_option('wpem_info_dark_color')) ? get_option('wpem_info_dark_color') : '#42BCFF';
-        $warning_dark_color     = !empty(get_option('wpem_warning_dark_color')) ? get_option('wpem_warning_dark_color') : '#FCD837';
-        $danger_dark_color     = !empty(get_option('wpem_danger_dark_color')) ? get_option('wpem_danger_dark_color') : '#FC4C20';
+        $primary_dark_color = !empty( get_option( 'wpem_primary_dark_color' ) ) ? get_option( 'wpem_primary_dark_color' ) : '#3366FF';
+        $success_dark_color = !empty( get_option( 'wpem_success_dark_color' ) ) ? get_option( 'wpem_success_dark_color' ) : '#77DD37';
+        $info_dark_color    = !empty( get_option( 'wpem_info_dark_color' ) ) ? get_option( 'wpem_info_dark_color' ) : '#42BCFF';
+        $warning_dark_color = !empty( get_option( 'wpem_warning_dark_color' ) ) ? get_option( 'wpem_warning_dark_color' ) : '#FCD837';
+        $danger_dark_color  = !empty( get_option( 'wpem_danger_dark_color' ) ) ? get_option( 'wpem_danger_dark_color' ) : '#FC4C20';
 
         $wpem_colors = $this->generate_scheme_formatted_colorcodes($primary_color, $success_color, $info_color, $warning_color, $danger_color);
 
         $wpem_dark_colors = $this->generate_scheme_formatted_colorcodes($primary_dark_color, $success_dark_color, $info_dark_color, $warning_dark_color, $danger_dark_color);
 
-        if(!empty($wpem_colors)) {
-            ksort($wpem_colors);
-
-            update_option('wpem_app_branding_settings', $wpem_colors);
+        if(!empty( $wpem_colors ) ) {
+            ksort( $wpem_colors );
+            update_option( 'wpem_app_branding_settings', $wpem_colors );
         }
 
-        if(!empty($wpem_dark_colors)) {
-            ksort($wpem_dark_colors);
-
-            update_option('wpem_app_branding_dark_settings', $wpem_dark_colors);
+        if(!empty( $wpem_dark_colors ) ) {
+            ksort( $wpem_dark_colors );
+            update_option( 'wpem_app_branding_dark_settings', $wpem_dark_colors );
         }
 
         $response = [];
-        $response['message'] = __('Successfully save App Branding.', 'wpem-rest-api');
+        $response['message'] = __( 'Your preferred color for your app branding has been successfully saved.', 'wpem-rest-api' );
 
         wp_send_json_success($response);
 
         wp_die();
     }
 
-
+    /**
+     * This function is used to generate schema for color of app
+     */
     public function generate_scheme_formatted_colorcodes($primary_color = "#3366FF",$success_color="#77DD37",$info_color = "#42BCFF",$warning_color = "#FCD837",$danger_color = "#FC4C20"){
 
-        $rgb_primary_color     = wpem_rest_api_hex_to_rgb($primary_color);
-        $rgb_success_color     = wpem_rest_api_hex_to_rgb($success_color);
-        $rgb_info_color     = wpem_rest_api_hex_to_rgb($info_color);
-        $rgb_warning_color     = wpem_rest_api_hex_to_rgb($warning_color);
-        $rgb_danger_color     = wpem_rest_api_hex_to_rgb($danger_color);
+        $rgb_primary_color = wpem_rest_api_hex_to_rgb( $primary_color );
+        $rgb_success_color = wpem_rest_api_hex_to_rgb( $success_color );
+        $rgb_info_color    = wpem_rest_api_hex_to_rgb( $info_color );
+        $rgb_warning_color = wpem_rest_api_hex_to_rgb( $warning_color );
+        $rgb_danger_color  = wpem_rest_api_hex_to_rgb( $danger_color );
 
         $default_rgb = 0.08;
 
         $wpem_colors = [];
-
         $data_color = [];
-        for($i=1;$i<10;$i++){
-            $brightness = $i*100;
-            $adjust_percentage = $i/10;
+        for( $i = 1; $i < 10; $i++ ){
+            $brightness = $i * 100;
+            $adjust_percentage = $i / 10;
 
-            if($brightness == 500) {
-                $adjust_percentage = 9/10;
+            if( $brightness == 500 ) {
+                $adjust_percentage = 9 / 10;
             }
 
-            $wpem_colors['color-primary-'.$brightness] = wpem_rest_api_color_brightness($primary_color, (1 - $adjust_percentage));
-            $wpem_colors['color-success-'.$brightness] = wpem_rest_api_color_brightness($success_color, (1 - $adjust_percentage));
-            $wpem_colors['color-info-'.$brightness] = wpem_rest_api_color_brightness($info_color, (1 - $adjust_percentage));
-            $wpem_colors['color-warning-'.$brightness] = wpem_rest_api_color_brightness($warning_color, (1 - $adjust_percentage));
-            $wpem_colors['color-danger-'.$brightness] = wpem_rest_api_color_brightness($danger_color, (1 - $adjust_percentage));
-
+            $wpem_colors['color-primary-'.$brightness] = wpem_rest_api_color_brightness( $primary_color, ( 1 - $adjust_percentage ) );
+            $wpem_colors['color-success-'.$brightness] = wpem_rest_api_color_brightness( $success_color, ( 1 - $adjust_percentage ) );
+            $wpem_colors['color-info-'.$brightness] = wpem_rest_api_color_brightness( $info_color, ( 1 - $adjust_percentage ) );
+            $wpem_colors['color-warning-'.$brightness] = wpem_rest_api_color_brightness( $warning_color, ( 1 - $adjust_percentage ) );
+            $wpem_colors['color-danger-'.$brightness] = wpem_rest_api_color_brightness( $danger_color, ( 1 - $adjust_percentage ) );
 
             if($brightness <= 600) {
-                $wpem_colors['color-primary-transparent-'.$brightness] = 'rgba('.$rgb_primary_color['red'].', '.$rgb_primary_color['green'].', '.$rgb_primary_color['blue'].', '. $i*$default_rgb .')';
-
-                $wpem_colors['color-success-transparent-'.$brightness] = 'rgba('.$rgb_success_color['red'].', '.$rgb_success_color['green'].', '.$rgb_success_color['blue'].', '. $i*$default_rgb .')';
-
-                $wpem_colors['color-info-transparent-'.$brightness] = 'rgba('.$rgb_info_color['red'].', '.$rgb_info_color['green'].', '.$rgb_info_color['blue'].', '. $i*$default_rgb .')';
-
-                $wpem_colors['color-warning-transparent-'.$brightness] = 'rgba('.$rgb_warning_color['red'].', '.$rgb_warning_color['green'].', '.$rgb_warning_color['blue'].', '. $i*$default_rgb .')';
-
-                $wpem_colors['color-danger-transparent-'.$brightness] = 'rgba('.$rgb_danger_color['red'].', '.$rgb_danger_color['green'].', '.$rgb_danger_color['blue'].', '. $i*$default_rgb .')';
-            }
-
+                $wpem_colors['color-primary-transparent-'.$brightness] = 'rgba( '.$rgb_primary_color['red'].', '.$rgb_primary_color['green'].', '.$rgb_primary_color['blue'].', '. $i*$default_rgb .' )';
+                $wpem_colors['color-success-transparent-'.$brightness] = 'rgba( '.$rgb_success_color['red'].', '.$rgb_success_color['green'].', '.$rgb_success_color['blue'].', '. $i*$default_rgb .' )';
+                $wpem_colors['color-info-transparent-'.$brightness] = 'rgba( '.$rgb_info_color['red'].', '.$rgb_info_color['green'].', '.$rgb_info_color['blue'].', '. $i*$default_rgb .' )';
+                $wpem_colors['color-warning-transparent-'.$brightness] = 'rgba( '.$rgb_warning_color['red'].', '.$rgb_warning_color['green'].', '.$rgb_warning_color['blue'].', '. $i*$default_rgb .' )';
+                $wpem_colors['color-danger-transparent-'.$brightness] = 'rgba( '.$rgb_danger_color['red'].', '.$rgb_danger_color['green'].', '.$rgb_danger_color['blue'].', '. $i*$default_rgb .' )';
+            } 
         }
-
         return $wpem_colors;
     }
 }
-
-new WPEM_Rest_APP_Branding();
+new WPEM_Rest_APP_Branding();
\ No newline at end of file
diff --git a/assets/css/backend.css b/assets/css/backend.css
index 91a43ff..0fab07e 100644
--- a/assets/css/backend.css
+++ b/assets/css/backend.css
@@ -78,6 +78,24 @@
   color: #666;
   background: #f5f5f5;
 }
+.wpem-api-message.updated{
+  margin:0;
+}
+.update_app_branding_message {
+  position: absolute;
+  bottom: 30px;
+  left: 100px;
+  transition: all 300ms ease;
+}
+.wpem-app-branding-mode.wpem-dark-mode .update_app_branding_message {
+  color: white;
+}
+.update_app_branding_message i.wpem-icon-checkmark {
+  color: #77dd37;
+}
+.update_app_branding_message i.wpem-icon-cross {
+  color: #FC4C20;
+}
 .wpem-admin-container .wpem-admin-top-title-section.postbox {
   margin: 0px;
   border: none;
diff --git a/assets/css/backend.min.css b/assets/css/backend.min.css
index 49de1e0..35b2753 100644
--- a/assets/css/backend.min.css
+++ b/assets/css/backend.min.css
@@ -1 +1 @@
-.wpem-admin-container .wpem-admin-left-sidebar{display:inline-block;width:25%}.wpem-admin-container .wpem-admin-right-container{display:inline-block;width:68%;vertical-align:top;background:#fff;margin-top:12px}.wpem-admin-container .wpem-admin-right-container.wpem-dark-mode .postbox{background:#151a30}.wpem-admin-container ul.wpem-admin-left-menu{background:#fff;border-left:1px solid #e3e3e3;border-right:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item:first-child{border-top:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item{width:100%;display:flex;margin:0;border-bottom:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab{border:0;transition:.2s all ease-in-out;position:relative;margin:0;padding:12px 5px 12px 45px;width:100%;background-color:#fff;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab:hover{background-color:#f9f9f9;color:#00a5fa;border-left:5px solid}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab:hover:before{color:#00a5fa}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active{position:relative}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:focus,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:focus:active,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:hover{background-color:#f9f9f9;color:#00a5fa;border-left:5px solid}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:after{content:"";position:absolute;right:15px;top:38%;border:solid #00a5fa;border-width:0 2px 2px 0;display:inline-block;padding:3px;transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}.wpem-admin-container .wpem-admin-top-title-section.postbox h3{padding:18px 20px;font-weight:500;font-size:1.6em;margin:0;letter-spacing:1px;color:#666;background:#f5f5f5}.wpem-admin-container .wpem-admin-top-title-section.postbox{margin:0;border:none;box-shadow:none}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item .nav-tab:before{font-family:wp-event-manager;position:absolute;font-weight:400;left:26px;transform:translate(-50%,-50%);top:50%;padding:0 5px;transition:.3s all ease-in-out;color:#a2acba}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item .nav-tab.nav-tab-active:before{color:#00a5fa}.wpem-admin-container .wpem-admin-right-container-holder{padding-top:0!important;border:1px solid #ccc;overflow:auto}@media only screen and (max-width:768px){.wpem-admin-container .wpem-admin-left-sidebar,.wpem-admin-container .wpem-admin-right-container{display:block;width:100%}}.wpem-admin-container .wpem-backend-theme-button,.wpem-admin-container a.wpem-backend-theme-button,.wpem-admin-container button.wpem-backend-theme-button,.wpem-admin-container input.wpem-backend-theme-button{background:#00a5fb;color:#fff;border:none;border-radius:3px;padding:5px 15px;text-transform:uppercase;font-weight:600;line-height:30px;display:inline-block;font-size:14px;transition:.3s all ease-in-out}.wpem-admin-container a.wpem-backend-theme-button:hover,.wpem-admin-container input.wpem-backend-theme-button:active,.wpem-admin-container input.wpem-backend-theme-button:hover{background:#008cd4;color:#fff;border:none}.wpem-admin-container input.wpem-backend-theme-button:focus{border:none;background:#008cd4;box-shadow:none;outline:0}.wpem-admin-container .wpem-backend-theme-button.wpem-revoke-button,.wpem-admin-container a.wpem-backend-theme-button.wpem-revoke-button{background:#e54646;transition:all .2s ease}.wpem-admin-container .wpem-backend-theme-button.wpem-revoke-button:hover,.wpem-admin-container a.wpem-backend-theme-button.wpem-revoke-button:hover{background:#e51e1e}.wpem-admin-container .wpem-admin-tab-title a.wpem-backend-theme-button{line-height:16px;font-size:12px;border-radius:3px;padding:7px 10px}.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table{width:100%;margin-top:0}.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr:first-child td,.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr:first-child th{padding-top:10px}.wpem-admin-container .wpem-admin-right-container-holder p.submit{padding:15px 20px;margin:0;background:#f5f5f5}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body{padding:20px}.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body{padding:20px}.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body table.form-table tbody tr:first-child td,.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body table.form-table tbody tr:first-child th{padding-top:0}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body h2:first-child{margin-top:0}.wpem-admin-container .wpem-admin-body input.button.action,.wpem-admin-container .wpem-admin-body p.search-box input.button{line-height:16px;font-size:12px;border-radius:3px;padding:7px 10px;background:#00a5fb;color:#fff;border:none}.wpem-admin-container .wpem-admin-body input.button.action:hover,.wpem-admin-container .wpem-admin-body p.search-box input.button:hover{background:#008cd4;color:#fff;border:none}.wpem-admin-container .wpem-admin-bottom-content input[type=color],.wpem-admin-container .wpem-admin-bottom-content input[type=date],.wpem-admin-container .wpem-admin-bottom-content input[type=datetime-local],.wpem-admin-container .wpem-admin-bottom-content input[type=datetime],.wpem-admin-container .wpem-admin-bottom-content input[type=email],.wpem-admin-container .wpem-admin-bottom-content input[type=month],.wpem-admin-container .wpem-admin-bottom-content input[type=number],.wpem-admin-container .wpem-admin-bottom-content input[type=password],.wpem-admin-container .wpem-admin-bottom-content input[type=search],.wpem-admin-container .wpem-admin-bottom-content input[type=tel],.wpem-admin-container .wpem-admin-bottom-content input[type=text],.wpem-admin-container .wpem-admin-bottom-content input[type=time],.wpem-admin-container .wpem-admin-bottom-content input[type=url],.wpem-admin-container .wpem-admin-bottom-content input[type=week],.wpem-admin-container .wpem-admin-bottom-content select,.wpem-admin-container .wpem-admin-bottom-content textarea{box-shadow:0 0 0 transparent;border:1px solid #ccc;background-color:#fff;color:#555}.wpem-admin-container .wpem-app-branding-mode .button label{display:none}.wpem-admin-container .app-branding-mode .button svg{max-width:25px;width:100%;display:block}.wpem-admin-container .app-branding-mode .button{padding:10px;height:50px}.wpem-admin-container .app-branding-mode{display:flex;padding:15px 20px;justify-content:flex-end}.wpem-admin-container .wpem-light-mode .wpem-light-mode.button{background:#00a5fa;border:2px solid #00a5fa;border-radius:3px 0 0 3px}.wpem-admin-container .wpem-light-mode .wpem-light-mode.button svg{fill:#fff}.wpem-admin-container .wpem-light-mode .wpem-dark-mode.button{border:2px solid #00a5fa;border-radius:0 3px 3px 0;background:#fff}.wpem-admin-container .wpem-light-mode .wpem-dark-mode.button svg{fill:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-light-mode.button{background:0 0;border:2px solid #00a5fa;border-radius:3px 0 0 3px}.wpem-admin-container .wpem-dark-mode .wpem-light-mode.button svg{fill:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button{border:2px solid #00a5fa;border-radius:0 3px 3px 0;background:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button svg{fill:#fff}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th{background:#eee;padding-left:20px;border:1px solid #ccc;text-align:center;border-left:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th:last-child{border-right:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead{width:100%}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th:last-child{border-right:none}.wpem-admin-container .wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr{background:#f1f1f1}.wpem-admin-container .wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr+tr{background:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td{text-align:center;border-right:1px solid #ccc;position:relative}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table span.wp-color-result-text{display:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table .wp-picker-container .iris-picker{position:absolute;z-index:2}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody td:last-child .wp-picker-container .iris-picker{right:0}.wpem-admin-container .wpem-color-pallet-wrapper{display:flex;flex-wrap:nowrap;justify-content:center;align-items:center}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet{width:80%;height:30px;padding:10px;text-align:center}.wpem-admin-container .wpem-app-branding .wpem-light-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr:first-child{background:#f1f1f1}.wpem-admin-container .wpem-color-pallet-wrapper div{font-size:14px;line-height:28px;font-weight:500;color:#888;padding:5px;width:20%}.wpem-admin-container .wpem-admin-bottom-content table.form-table p{padding-bottom:10px}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody .wpem-color-pellet-code{padding:10px;font-size:14px;line-height:28px;font-weight:600}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet span{opacity:0;transition:.2s all ease}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet:hover span{display:block;opacity:1}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode h3.wpem-admin-tab-title{background:#202745;color:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table thead tr th{background:#202745;color:#fff;border-color:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td{border-color:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td:last-child{border:none}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr+tr{background:#202745;color:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-color-pallet-wrapper div{color:#fff}.wpem-admin-container .wpem-api-access .wpem-admin-right-container-holder p.submit,.wpem-admin-container .wpem-app-branding .wpem-admin-right-container-holder p.submit{display:none}.wpem-admin-container .wpem-admin-right-container-holder.wpem-admin-body .wpem-admin-top-title-section .wpem-admin-bottom-content p.submit,.wpem-admin-container .wpem-app-branding .wpem-admin-right-container-holder .wpem-admin-top-title-section p.submit{display:block}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-right-container-holder p.submit{background:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr{background:#151a30;color:#fff}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr td:first-child{border-left:none}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button img,.wpem-admin-container .wpem-light-mode .wpem-light-mode.button img{-webkit-filter:brightness(0) invert(1);filter:brightness(0) invert(1)}.wpem-admin-container .wpem-api-access .wpem-admin-right-container-holder .wpem-admin-bottom-content .settings-panel p.submit{display:block}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body .form-field .file_url{text-align:left;display:flex;width:100%}.wpem-no-api-wrap{height:100vh;max-height:400px;display:flex;justify-content:center;align-items:center;flex-direction:column;max-width:400px;margin:0 auto}.wpem-no-api-wrap h2.wpem-rest-api-BlankState-message{line-height:1.42;color:#ccc;letter-spacing:.2px;text-align:center}.wpem-no-api-wrap a.wpem-rest-api-BlankState-cta{padding:12px 40px;margin:10px 0}.wpem-no-api-wrap .wpem-no-api-icon span{font-size:150px;line-height:150px;height:150px;width:150px;color:#dcdcdc}
+.wpem-admin-container .wpem-admin-left-sidebar{display:inline-block;width:25%}.wpem-admin-container .wpem-admin-right-container{display:inline-block;width:68%;vertical-align:top;background:#fff;margin-top:12px}.wpem-admin-container .wpem-admin-right-container.wpem-dark-mode .postbox{background:#151a30}.wpem-admin-container ul.wpem-admin-left-menu{background:#fff;border-left:1px solid #e3e3e3;border-right:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item:first-child{border-top:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item{width:100%;display:flex;margin:0;border-bottom:1px solid #e3e3e3}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab{border:0;transition:.2s all ease-in-out;position:relative;margin:0;padding:12px 5px 12px 45px;width:100%;background-color:#fff;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab:hover{background-color:#f9f9f9;color:#00a5fa;border-left:5px solid}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab:hover:before{color:#00a5fa}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active{position:relative}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:focus,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:focus:active,.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:hover{background-color:#f9f9f9;color:#00a5fa;border-left:5px solid}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item a.nav-tab-active:after{content:"";position:absolute;right:15px;top:38%;border:solid #00a5fa;border-width:0 2px 2px 0;display:inline-block;padding:3px;transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}.wpem-admin-container .wpem-admin-top-title-section.postbox h3{padding:18px 20px;font-weight:500;font-size:1.6em;margin:0;letter-spacing:1px;color:#666;background:#f5f5f5}.wpem-api-message.updated{margin:0;}.update_app_branding_message {position: absolute;bottom: 30px;left: 100px;transition:all 300ms ease;}.wpem-app-branding-mode.wpem-dark-mode .update_app_branding_message{color: white;}.update_app_branding_message i.wpem-icon-checkmark{color: #77dd37;}.update_app_branding_message i.wpem-icon-cross{color: #FC4C20;}.wpem-admin-container .wpem-admin-top-title-section.postbox{margin:0;border:none;box-shadow:none}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item .nav-tab:before{font-family:wp-event-manager;position:absolute;font-weight:400;left:26px;transform:translate(-50%,-50%);top:50%;padding:0 5px;transition:.3s all ease-in-out;color:#a2acba}.wpem-admin-container .wpem-admin-left-sidebar ul.wpem-admin-left-menu li.wpem-admin-left-menu-item .nav-tab.nav-tab-active:before{color:#00a5fa}.wpem-admin-container .wpem-admin-right-container-holder{padding-top:0!important;border:1px solid #ccc;overflow:auto}@media only screen and (max-width:768px){.wpem-admin-container .wpem-admin-left-sidebar,.wpem-admin-container .wpem-admin-right-container{display:block;width:100%}}.wpem-admin-container .wpem-backend-theme-button,.wpem-admin-container a.wpem-backend-theme-button,.wpem-admin-container button.wpem-backend-theme-button,.wpem-admin-container input.wpem-backend-theme-button{background:#00a5fb;color:#fff;border:none;border-radius:3px;padding:5px 15px;text-transform:uppercase;font-weight:600;line-height:30px;display:inline-block;font-size:14px;transition:.3s all ease-in-out}.wpem-admin-container a.wpem-backend-theme-button:hover,.wpem-admin-container input.wpem-backend-theme-button:active,.wpem-admin-container input.wpem-backend-theme-button:hover{background:#008cd4;color:#fff;border:none}.wpem-admin-container input.wpem-backend-theme-button:focus{border:none;background:#008cd4;box-shadow:none;outline:0}.wpem-admin-container .wpem-backend-theme-button.wpem-revoke-button,.wpem-admin-container a.wpem-backend-theme-button.wpem-revoke-button{background:#e54646;transition:all .2s ease}.wpem-admin-container .wpem-backend-theme-button.wpem-revoke-button:hover,.wpem-admin-container a.wpem-backend-theme-button.wpem-revoke-button:hover{background:#e51e1e}.wpem-admin-container .wpem-admin-tab-title a.wpem-backend-theme-button{line-height:16px;font-size:12px;border-radius:3px;padding:7px 10px}.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table{width:100%;margin-top:0}.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr:first-child td,.wpem-admin-container .wpem-admin-right-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr:first-child th{padding-top:10px}.wpem-admin-container .wpem-admin-right-container-holder p.submit{padding:15px 20px;margin:0;background:#f5f5f5}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body{padding:20px}.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body{padding:20px}.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body table.form-table tbody tr:first-child td,.wpem-admin-container .wpem-api-access.wpem-admin-right-container .wpem-admin-right-container-holder .wpem-admin-body table.form-table tbody tr:first-child th{padding-top:0}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body h2:first-child{margin-top:0}.wpem-admin-container .wpem-admin-body input.button.action,.wpem-admin-container .wpem-admin-body p.search-box input.button{line-height:16px;font-size:12px;border-radius:3px;padding:7px 10px;background:#00a5fb;color:#fff;border:none}.wpem-admin-container .wpem-admin-body input.button.action:hover,.wpem-admin-container .wpem-admin-body p.search-box input.button:hover{background:#008cd4;color:#fff;border:none}.wpem-admin-container .wpem-admin-bottom-content input[type=color],.wpem-admin-container .wpem-admin-bottom-content input[type=date],.wpem-admin-container .wpem-admin-bottom-content input[type=datetime-local],.wpem-admin-container .wpem-admin-bottom-content input[type=datetime],.wpem-admin-container .wpem-admin-bottom-content input[type=email],.wpem-admin-container .wpem-admin-bottom-content input[type=month],.wpem-admin-container .wpem-admin-bottom-content input[type=number],.wpem-admin-container .wpem-admin-bottom-content input[type=password],.wpem-admin-container .wpem-admin-bottom-content input[type=search],.wpem-admin-container .wpem-admin-bottom-content input[type=tel],.wpem-admin-container .wpem-admin-bottom-content input[type=text],.wpem-admin-container .wpem-admin-bottom-content input[type=time],.wpem-admin-container .wpem-admin-bottom-content input[type=url],.wpem-admin-container .wpem-admin-bottom-content input[type=week],.wpem-admin-container .wpem-admin-bottom-content select,.wpem-admin-container .wpem-admin-bottom-content textarea{box-shadow:0 0 0 transparent;border:1px solid #ccc;background-color:#fff;color:#555}.wpem-admin-container .wpem-app-branding-mode .button label{display:none}.wpem-admin-container .app-branding-mode .button svg{max-width:25px;width:100%;display:block}.wpem-admin-container .app-branding-mode .button{padding:10px;height:50px}.wpem-admin-container .app-branding-mode{display:flex;padding:15px 20px;justify-content:flex-end}.wpem-admin-container .wpem-light-mode .wpem-light-mode.button{background:#00a5fa;border:2px solid #00a5fa;border-radius:3px 0 0 3px}.wpem-admin-container .wpem-light-mode .wpem-light-mode.button svg{fill:#fff}.wpem-admin-container .wpem-light-mode .wpem-dark-mode.button{border:2px solid #00a5fa;border-radius:0 3px 3px 0;background:#fff}.wpem-admin-container .wpem-light-mode .wpem-dark-mode.button svg{fill:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-light-mode.button{background:0 0;border:2px solid #00a5fa;border-radius:3px 0 0 3px}.wpem-admin-container .wpem-dark-mode .wpem-light-mode.button svg{fill:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button{border:2px solid #00a5fa;border-radius:0 3px 3px 0;background:#00a5fa}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button svg{fill:#fff}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th{background:#eee;padding-left:20px;border:1px solid #ccc;text-align:center;border-left:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th:last-child{border-right:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead{width:100%}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table thead tr th:last-child{border-right:none}.wpem-admin-container .wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr{background:#f1f1f1}.wpem-admin-container .wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr+tr{background:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td{text-align:center;border-right:1px solid #ccc;position:relative}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table span.wp-color-result-text{display:none}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table .wp-picker-container .iris-picker{position:absolute;z-index:2}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody td:last-child .wp-picker-container .iris-picker{right:0}.wpem-admin-container .wpem-color-pallet-wrapper{display:flex;flex-wrap:nowrap;justify-content:center;align-items:center}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet{width:80%;height:30px;padding:10px;text-align:center}.wpem-admin-container .wpem-app-branding .wpem-light-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr:first-child{background:#f1f1f1}.wpem-admin-container .wpem-color-pallet-wrapper div{font-size:14px;line-height:28px;font-weight:500;color:#888;padding:5px;width:20%}.wpem-admin-container .wpem-admin-bottom-content table.form-table p{padding-bottom:10px}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody .wpem-color-pellet-code{padding:10px;font-size:14px;line-height:28px;font-weight:600}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet span{opacity:0;transition:.2s all ease}.wpem-admin-container .wpem-color-pallet-wrapper .wpem-color-pallet:hover span{display:block;opacity:1}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode h3.wpem-admin-tab-title{background:#202745;color:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table thead tr th{background:#202745;color:#fff;border-color:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td{border-color:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-app-branding .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr td:last-child{border:none}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr+tr{background:#202745;color:#fff}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-color-pallet-wrapper div{color:#fff}.wpem-admin-container .wpem-api-access .wpem-admin-right-container-holder p.submit,.wpem-admin-container .wpem-app-branding .wpem-admin-right-container-holder p.submit{display:none}.wpem-admin-container .wpem-admin-right-container-holder.wpem-admin-body .wpem-admin-top-title-section .wpem-admin-bottom-content p.submit,.wpem-admin-container .wpem-app-branding .wpem-admin-right-container-holder .wpem-admin-top-title-section p.submit{display:block}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-right-container-holder p.submit{background:#151a30}.wpem-admin-container .wpem-app-branding-mode.wpem-dark-mode .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content .settings-panel table.form-table tbody tr{background:#151a30;color:#fff}.wpem-admin-container .wpem-admin-top-title-section.postbox .wpem-admin-bottom-content table.form-table tbody tr td:first-child{border-left:none}.wpem-admin-container .wpem-dark-mode .wpem-dark-mode.button img,.wpem-admin-container .wpem-light-mode .wpem-light-mode.button img{-webkit-filter:brightness(0) invert(1);filter:brightness(0) invert(1)}.wpem-admin-container .wpem-api-access .wpem-admin-right-container-holder .wpem-admin-bottom-content .settings-panel p.submit{display:block}.wpem-admin-container .wpem-admin-bottom-content .wpem-admin-body .form-field .file_url{text-align:left;display:flex;width:100%}.wpem-no-api-wrap{height:100vh;max-height:400px;display:flex;justify-content:center;align-items:center;flex-direction:column;max-width:400px;margin:0 auto}.wpem-no-api-wrap h2.wpem-rest-api-BlankState-message{line-height:1.42;color:#ccc;letter-spacing:.2px;text-align:center}.wpem-no-api-wrap a.wpem-rest-api-BlankState-cta{padding:12px 40px;margin:10px 0}.wpem-no-api-wrap .wpem-no-api-icon span{font-size:150px;line-height:150px;height:150px;width:150px;color:#dcdcdc}
diff --git a/assets/js/admin.js b/assets/js/admin.js
index 74fd454..952476c 100644
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -17,46 +17,37 @@ var WPEMRestAPIAdmin = function () {
             jQuery("table#app-branding-color-dark").hide();
 
             //light mode
-            jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-light-mode").click(
-                function () {
-                    jQuery(".wpem-app-branding-mode").removeClass("wpem-dark-mode");
-                    jQuery(".wpem-app-branding-mode").addClass("wpem-light-mode");
-                    jQuery("table#app-branding-color").show();
-                    jQuery("table#app-branding-color-dark").hide();
-                }
-            );
+            jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-light-mode").click(function () {
+                jQuery(".wpem-app-branding-mode").removeClass("wpem-dark-mode");
+                jQuery(".wpem-app-branding-mode").addClass("wpem-light-mode");
+                jQuery("table#app-branding-color").show();
+                jQuery("table#app-branding-color-dark").hide();
+            });
             //dark mode
-            jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-dark-mode").click(
-                function () {
-                    jQuery("table#app-branding-color").hide();
-                    jQuery("table#app-branding-color-dark").show();
-
-                    jQuery(".wpem-app-branding-mode").removeClass("wpem-light-mode");
-                    jQuery(".wpem-app-branding-mode").addClass("wpem-dark-mode");
-                }
-            );
+            jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-dark-mode").click(function () {
+                jQuery("table#app-branding-color").hide();
+                jQuery("table#app-branding-color-dark").show();
+                jQuery(".wpem-app-branding-mode").removeClass("wpem-light-mode");
+                jQuery(".wpem-app-branding-mode").addClass("wpem-dark-mode");
+            });
 
             jQuery("#update_app_branding").on('click', WPEMRestAPIAdmin.actions.saveAppBranding);
 
-            jQuery('.wpem-colorpicker').wpColorPicker(
-                {
-                    defaultColor: true,
-                    change: function (event, ui) {
-                         var element = event.target;
-                         var color = ui.color.toString();
-
-                         WPEMRestAPIAdmin.actions.changeBrightness(event, color);
-                    },
-                }
-            );
-
-
-            //upload media
-            //jQuery('.wp_event_manager_upload_file_button').
-
+            let ajaxTimer;
+            jQuery('.wpem-colorpicker').wpColorPicker({
+                defaultColor: true,
+                change: function (event, ui) {
+                    var element = event.target;
+                    var color = ui.color.toString();
+
+                    clearTimeout(ajaxTimer);
+                    ajaxTimer = setTimeout(function() {
+                        WPEMRestAPIAdmin.actions.changeBrightness(event, color);
+                    }, 500);
+                },
+            });
         },
-        actions:
-        {
+        actions: {
             /// <summary>
             ///
             /// </summary>
@@ -68,68 +59,51 @@ var WPEMRestAPIAdmin = function () {
                 var self = this;
 
                 //self.block();
-                jQuery.ajax(
-                    {
-                        type: 'POST',
-                        url: wpem_rest_api_admin.ajaxUrl,
-                        data:
-                        {
-                            action: 'save_rest_api_keys',
-                            security: wpem_rest_api_admin.save_api_nonce,
-                            key_id: jQuery('#key_id').val(),
-                            description: jQuery('#key_description').val(),
-                            user: jQuery('#key_user').val(),
-                            permissions: jQuery('#key_permissions').val(),
-                            event_id: jQuery('#event_id').val(),
-                            date_expires: jQuery('#date_expires').val()
-                        },
-                        beforeSend: function (jqXHR, settings) {
-                             //Common.logInfo("Before send called...");
-                        },
-                        success: function (response) {
-                            if (response.success) {
-                                var data = response.data;
-
-                                jQuery('h2, h3', self.el).first().html('<div class="wpem-api-message updated"><p>' + data.message + '</p></div>');
-
-                                if (0 < data.consumer_key.length && 0 < data.consumer_secret.length) {
-                                      jQuery('#api-keys-options', self.el).parent().remove();
-                                      jQuery('p.submit', self.el).empty().append(data.revoke_url);
-
-                                      var template = wp.template('api-keys-template');
-
-                                    jQuery('#key-fields p.submit', self.el).before(
-                                        template(
-                                            {
-                                                consumer_key: data.consumer_key,
-                                                consumer_secret: data.consumer_secret,
-                                                app_key: data.app_key
-                                            }
-                                        )
-                                    );
-                                          //self.createQRCode( data.consumer_key, data.consumer_secret );
-                                          //self.initTipTip( '.copy-key' );
-                                          //self.initTipTip( '.copy-secret' );
-                                } else {
-                                    jQuery('#key_description', self.el).val(data.description);
-                                    jQuery('#key_user', self.el).val(data.user_id);
-                                    jQuery('#key_permissions', self.el).val(data.permissions);
-                                }
+                jQuery.ajax({
+                    type: 'POST',
+                    url: wpem_rest_api_admin.ajaxUrl,
+                    data: {
+                        action: 'save_rest_api_keys',
+                        security: wpem_rest_api_admin.save_api_nonce,
+                        key_id: jQuery('#key_id').val(),
+                        description: jQuery('#key_description').val(),
+                        user: jQuery('#key_user').val(),
+                        permissions: jQuery('#key_permissions').val(),
+                        event_id: jQuery('#event_id').val(),
+                        date_expires: jQuery('#date_expires').val()
+                    },
+                    beforeSend: function (jqXHR, settings) { },
+                    success: function (response) {
+                        if(response.success) {
+                            var data = response.data;
+
+                            jQuery('h2, h3', self.el).first().html('<div class="wpem-api-message updated"><p>' + data.message + '</p></div>');
+
+                            if (0 < data.consumer_key.length && 0 < data.consumer_secret.length) {
+                                jQuery('#api-keys-options', self.el).parent().remove();
+                                jQuery('p.submit', self.el).empty().append(data.revoke_url);
+
+                                var template = wp.template('api-keys-template');
+
+                                jQuery('#key-fields p.submit', self.el).before(
+                                    template({
+                                        consumer_key: data.consumer_key,
+                                        consumer_secret: data.consumer_secret,
+                                        app_key: data.app_key
+                                    })
+                                );
                             } else {
-
+                                jQuery('#key_description', self.el).val(data.description);
+                                jQuery('#key_user', self.el).val(data.user_id);
+                                jQuery('#key_permissions', self.el).val(data.permissions);
                             }
-
-                        },
-                        error: function (jqXHR, textStatus, errorThrown) {
-                             jQuery('h2, h3', self.el).first().append('<div class="wpem-api-message error"><p>' + errorThrown + '</p></div>');
-                        },
-                        complete: function (jqXHR, textStatus) {
-                             //jQuery('#key-fields').find('.status-message').addClass('notice notice notice-success');
-
                         }
-                    }
-                );
-
+                    },
+                    error: function (jqXHR, textStatus, errorThrown) {
+                        jQuery('h2, h3', self.el).first().append('<div class="wpem-api-message error"><p>' + errorThrown + '</p></div>');
+                    },
+                    complete: function (jqXHR, textStatus) {}
+                });
             },
 
             /// <summary>
@@ -142,73 +116,60 @@ var WPEMRestAPIAdmin = function () {
                 event.preventDefault();
                 var self = this;
 
-                //self.block();
-                jQuery.ajax(
-                    {
-                        type: 'POST',
-                        url: wpem_rest_api_admin.ajaxUrl,
-                        data:
-                        {
-                            action: 'save_app_branding',
-                            security: wpem_rest_api_admin.save_app_branding_nonce,
-                            wpem_primary_color: jQuery('input[name="wpem_primary_color"]').val(),
-                            wpem_success_color: jQuery('input[name="wpem_success_color"]').val(),
-                            wpem_info_color: jQuery('input[name="wpem_info_color"]').val(),
-                            wpem_warning_color: jQuery('input[name="wpem_warning_color"]').val(),
-                            wpem_danger_color: jQuery('input[name="wpem_danger_color"]').val(),
-
-                            wpem_primary_dark_color: jQuery('input[name="wpem_primary_dark_color"]').val(),
-                            wpem_success_dark_color: jQuery('input[name="wpem_success_dark_color"]').val(),
-                            wpem_info_dark_color: jQuery('input[name="wpem_info_dark_color"]').val(),
-                            wpem_warning_dark_color: jQuery('input[name="wpem_warning_dark_color"]').val(),
-                            wpem_danger_dark_color: jQuery('input[name="wpem_danger_dark_color"]').val(),
-                        },
-                        beforeSend: function (jqXHR, settings) {
-                             //Common.logInfo("Before send called...");
-                        },
-                        success: function (response) {
-                             jQuery('.wpem-branding-status').html('<div class="wpem-api-message updated"><p>' + response.data.message + '</p></div>');
-                        },
-                        error: function (jqXHR, textStatus, errorThrown) {
-                             jQuery('.wpem-branding-status').html('<div class="wpem-api-message error"><p>' + errorThrown + '</p></div>');
-                        },
-                        complete: function (jqXHR, textStatus) {
-                             //jQuery('#key-fields').find('.status-message').addClass('notice notice notice-success');
-                        }
-                    }
-                );
-
+                jQuery.ajax({
+                    type: 'POST',
+                    url: wpem_rest_api_admin.ajaxUrl,
+                    data: {
+                        action: 'save_app_branding',
+                        security: wpem_rest_api_admin.save_app_branding_nonce,
+                        wpem_primary_color: jQuery('input[name="wpem_primary_color"]').val(),
+                        wpem_success_color: jQuery('input[name="wpem_success_color"]').val(),
+                        wpem_info_color: jQuery('input[name="wpem_info_color"]').val(),
+                        wpem_warning_color: jQuery('input[name="wpem_warning_color"]').val(),
+                        wpem_danger_color: jQuery('input[name="wpem_danger_color"]').val(),
+
+                        wpem_primary_dark_color: jQuery('input[name="wpem_primary_dark_color"]').val(),
+                        wpem_success_dark_color: jQuery('input[name="wpem_success_dark_color"]').val(),
+                        wpem_info_dark_color: jQuery('input[name="wpem_info_dark_color"]').val(),
+                        wpem_warning_dark_color: jQuery('input[name="wpem_warning_dark_color"]').val(),
+                        wpem_danger_dark_color: jQuery('input[name="wpem_danger_dark_color"]').val(),
+                    },
+                    beforeSend: function (jqXHR, settings) {},
+                    success: function (response) {
+                        jQuery('.wpem-branding-status').html('<div class="wpem-api-message updated"><p>' + response.data.message + '</p></div>');
+                        jQuery('.update_app_branding_message').html('<div class="update_app_branding_message_update"><i class="wpem-icon-checkmark"></i> Your preferred color for your app branding has been successfully saved.</div>');
+                    },
+                    error: function (jqXHR, textStatus, errorThrown) {
+                        jQuery('.wpem-branding-status').html('<div class="wpem-api-message error"><p>' + errorThrown + '</p></div>');
+                        jQuery('.update_app_branding_message').html('<div class="update_app_branding_message_update"><i class="wpem-icon-cross"></i> Your preferred color for your app branding has not been successfully saved.</div>');
+                    },
+                    complete: function (jqXHR, textStatus) {}
+                });
             },
 
             changeBrightness: function (event, color) {
                 var name = event.target.name;
                 var tableid = jQuery(event.target).parents('table').attr('id');
 
-                jQuery.ajax(
-                    {
-                        url: wpem_rest_api_admin.ajaxUrl,
-                        type: 'POST',
-                        dataType: 'HTML',
-                        data: {
-                            action: 'change_brighness_color',
-                            color: color,
-                        },
-                        success: function (response) {
-                            const html = response.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#039;/g, "'");
-                            jQuery('#' + tableid + ' tbody tr td#' + name).html(html);
-                        }
+                jQuery.ajax({
+                    url: wpem_rest_api_admin.ajaxUrl,
+                    type: 'POST',
+                    dataType: 'HTML',
+                    data: {
+                        action: 'change_brighness_color',
+                        color: color,
+                    },
+                    success: function (response) {
+                        const html = response.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#039;/g, "'");
+                        jQuery('#' + tableid + ' tbody tr td#' + name).html(html);
                     }
-                );
+                });
             },
-
-
         }
     } //enf of return
 }; //end of class
 
 WPEMRestAPIAdmin = WPEMRestAPIAdmin();
-jQuery(document).ready(
-    function ($) {
-        WPEMRestAPIAdmin.init();
-    }
-);
+jQuery(document).ready(function ($) {
+    WPEMRestAPIAdmin.init();
+});
\ No newline at end of file
diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
new file mode 100644
index 0000000..d008d13
--- /dev/null
+++ b/assets/js/admin.min.js
@@ -0,0 +1 @@
+var WPEMRestAPIAdmin=function(){return{init:function(){jQuery("#update_api_key").on("click",WPEMRestAPIAdmin.actions.saveApiKey),jQuery("select#key_user").chosen(),jQuery("select#event_id").chosen(),jQuery("input#date_expires").datepicker({dateFormat:"yy-mm-dd"}),jQuery("table#app-branding-color-dark").hide(),jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-light-mode").click(function(){jQuery(".wpem-app-branding-mode").removeClass("wpem-dark-mode"),jQuery(".wpem-app-branding-mode").addClass("wpem-light-mode"),jQuery("table#app-branding-color").show(),jQuery("table#app-branding-color-dark").hide()}),jQuery(".wpem-app-branding-mode .app-branding-mode .wpem-dark-mode").click(function(){jQuery("table#app-branding-color").hide(),jQuery("table#app-branding-color-dark").show(),jQuery(".wpem-app-branding-mode").removeClass("wpem-light-mode"),jQuery(".wpem-app-branding-mode").addClass("wpem-dark-mode")}),jQuery("#update_app_branding").on("click",WPEMRestAPIAdmin.actions.saveAppBranding);let e;jQuery(".wpem-colorpicker").wpColorPicker({defaultColor:!0,change:function(a,n){a.target;var r=n.color.toString();clearTimeout(e),e=setTimeout(function(){WPEMRestAPIAdmin.actions.changeBrightness(a,r)},500)}})},actions:{saveApiKey:function(e){e.preventDefault();var a=this;jQuery.ajax({type:"POST",url:wpem_rest_api_admin.ajaxUrl,data:{action:"save_rest_api_keys",security:wpem_rest_api_admin.save_api_nonce,key_id:jQuery("#key_id").val(),description:jQuery("#key_description").val(),user:jQuery("#key_user").val(),permissions:jQuery("#key_permissions").val(),event_id:jQuery("#event_id").val(),date_expires:jQuery("#date_expires").val()},beforeSend:function(e,a){},success:function(e){if(e.success){var n=e.data;if(jQuery("h2, h3",a.el).first().html('<div class="wpem-api-message updated"><p>'+n.message+"</p></div>"),0<n.consumer_key.length&&0<n.consumer_secret.length){jQuery("#api-keys-options",a.el).parent().remove(),jQuery("p.submit",a.el).empty().append(n.revoke_url);var r=wp.template("api-keys-template");jQuery("#key-fields p.submit",a.el).before(r({consumer_key:n.consumer_key,consumer_secret:n.consumer_secret,app_key:n.app_key}))}else jQuery("#key_description",a.el).val(n.description),jQuery("#key_user",a.el).val(n.user_id),jQuery("#key_permissions",a.el).val(n.permissions)}},error:function(e,n,r){jQuery("h2, h3",a.el).first().append('<div class="wpem-api-message error"><p>'+r+"</p></div>")},complete:function(e,a){}})},saveAppBranding:function(e){e.preventDefault(),jQuery.ajax({type:"POST",url:wpem_rest_api_admin.ajaxUrl,data:{action:"save_app_branding",security:wpem_rest_api_admin.save_app_branding_nonce,wpem_primary_color:jQuery('input[name="wpem_primary_color"]').val(),wpem_success_color:jQuery('input[name="wpem_success_color"]').val(),wpem_info_color:jQuery('input[name="wpem_info_color"]').val(),wpem_warning_color:jQuery('input[name="wpem_warning_color"]').val(),wpem_danger_color:jQuery('input[name="wpem_danger_color"]').val(),wpem_primary_dark_color:jQuery('input[name="wpem_primary_dark_color"]').val(),wpem_success_dark_color:jQuery('input[name="wpem_success_dark_color"]').val(),wpem_info_dark_color:jQuery('input[name="wpem_info_dark_color"]').val(),wpem_warning_dark_color:jQuery('input[name="wpem_warning_dark_color"]').val(),wpem_danger_dark_color:jQuery('input[name="wpem_danger_dark_color"]').val()},beforeSend:function(e,a){},success:function(e){jQuery(".wpem-branding-status").html('<div class="wpem-api-message updated"><p>'+e.data.message+"</p></div>"),jQuery(".update_app_branding_message").html('<div class="update_app_branding_message_update"><i class="wpem-icon-checkmark"></i> Your preferred color for your app branding has been successfully saved.</div>')},error:function(e,a,n){jQuery(".wpem-branding-status").html('<div class="wpem-api-message error"><p>'+n+"</p></div>"),jQuery(".update_app_branding_message").html('<div class="update_app_branding_message_update"><i class="wpem-icon-cross"></i> Your preferred color for your app branding has not been successfully saved.</div>')},complete:function(e,a){}})},changeBrightness:function(e,a){var n=e.target.name,r=jQuery(e.target).parents("table").attr("id");jQuery.ajax({url:wpem_rest_api_admin.ajaxUrl,type:"POST",dataType:"HTML",data:{action:"change_brighness_color",color:a},success:function(e){let a=e.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'");jQuery("#"+r+" tbody tr td#"+n).html(a)}})}}}};WPEMRestAPIAdmin=WPEMRestAPIAdmin(),jQuery(document).ready(function(e){WPEMRestAPIAdmin.init()});
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-app-branding.php b/includes/rest-api/wpem-rest-app-branding.php
index e4c475e..96baedb 100644
--- a/includes/rest-api/wpem-rest-app-branding.php
+++ b/includes/rest-api/wpem-rest-app-branding.php
@@ -1,38 +1,26 @@
 <?php
-/**
- * REST API Events controller
- *
- * Handles requests to the /events endpoint.
- *
- * @since 1.0.0
- */
-
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
 /**
  * REST API APP Branding controller class.
  *
  * @extends WPEM_REST_CRUD_Controller
  */
-class WPEM_REST_APP_Branding_Controller extends WPEM_REST_CRUD_Controller
-{
+class WPEM_REST_APP_Branding_Controller extends WPEM_REST_CRUD_Controller {
     /**
      * Endpoint namespace.
-     *
      * @var string
      */
     protected $namespace = 'wpem';
 
     /**
      * Route base.
-     *
      * @var string
      */
     protected $rest_base = 'branding';
 
     /**
      * Post type.
-     *
      * @var string
      */
     protected $post_type = 'event_listing';
@@ -40,12 +28,10 @@ class WPEM_REST_APP_Branding_Controller extends WPEM_REST_CRUD_Controller
     /**
      * Initialize event actions.
      */
-    public function __construct()
-    {
-        //add_action( "wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
-        add_action('rest_api_init', array( $this, 'register_routes' ), 10);
+    public function __construct() {
+        add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
 
-        if(!class_exists('WPEM_Rest_API_Settings')) {
+        if( !class_exists( 'WPEM_Rest_API_Settings' ) ) {
             include_once WPEM_REST_API_PLUGIN_DIR.'/admin/wpem-rest-api-settings.php';
         }
     }
@@ -53,19 +39,16 @@ public function __construct()
     /**
      * Register the routes for events.
      */
-    public function register_routes()
-    {
+    public function register_routes() {
         register_rest_route(
             $this->namespace,
             '/' . $this->rest_base,
             array(
-            array(
-            'methods'             => WP_REST_Server::READABLE,
-            'callback'            => array( $this, 'get_branding_settings' ),
-            'permission_callback' => array( $this, 'get_items_permissions_check' ),
-            //'args'                => $this->get_collection_params(),
-            )
-            //'schema' => array( $this, 'get_public_item_schema' ),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_branding_settings' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                )
             )
         );
     }
@@ -76,19 +59,16 @@ public function register_routes()
      * @since 1.0.0
      * @param 
      */
-    public function get_branding_settings()
-    {
+    public function get_branding_settings() {
         $wpem_app_branding_settings = [];
 
-        $wpem_app_branding_settings['app_logo'] = get_option('wpem_rest_api_app_logo');
-        $wpem_app_branding_settings['app_splash_screen_image'] = get_option('wpem_rest_api_app_splash_screen_image');
-        $wpem_app_branding_settings['color_scheme'] = get_option('wpem_app_branding_settings');
-        $wpem_app_branding_settings['dark_color_scheme'] = get_option('wpem_app_branding_dark_settings');
+        $wpem_app_branding_settings['app_name'] = get_option( 'wpem_rest_api_app_name' );
+        $wpem_app_branding_settings['app_logo'] = get_option( 'wpem_rest_api_app_logo' );
+        $wpem_app_branding_settings['app_splash_screen_image'] = get_option( 'wpem_rest_api_app_splash_screen_image' );
+        $wpem_app_branding_settings['color_scheme'] = get_option( 'wpem_app_branding_settings' );
+        $wpem_app_branding_settings['dark_color_scheme'] = get_option( 'wpem_app_branding_dark_settings' );
 
-        return apply_filters('wpem_app_branding_settings', $wpem_app_branding_settings);
+        return apply_filters( 'wpem_app_branding_settings', $wpem_app_branding_settings );
     }
 }
-
-
-
-new WPEM_REST_APP_Branding_Controller();
+new WPEM_REST_APP_Branding_Controller();
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-authentication.php b/includes/rest-api/wpem-rest-authentication.php
index 49f5244..b00fd83 100644
--- a/includes/rest-api/wpem-rest-authentication.php
+++ b/includes/rest-api/wpem-rest-authentication.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * REST API Authentication
- *
- * @since    1.0.0
- */
-
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -47,11 +41,8 @@ public function __construct() {
 
 		//register rout here for app key and login
 		add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
-
 	}
 
-
-
 	/**
 	 * Check if is request to our REST API.
 	 *
@@ -84,14 +75,12 @@ protected function is_request_to_rest_api() {
 	 */
 	public function authenticate( $user_id ) {
 		// Do not authenticate twice and check if is a request to our endpoint in the WP REST API.
-		if ( ! empty( $user_id ) || ! $this->is_request_to_rest_api() ) {
+		if ( !empty( $user_id ) || !$this->is_request_to_rest_api() ) {
 			return $user_id;
 		}
-
 		if ( is_ssl() ) {
 			$user_id = $this->perform_basic_authentication();
 		}
-
 		if ( $user_id ) {
 			return $user_id;
 		}
@@ -108,7 +97,7 @@ public function authenticate( $user_id ) {
 	 */
 	public function check_authentication_error( $error ) {
 		// Pass through other errors.
-		if ( ! empty( $error ) ) {
+		if ( !empty( $error ) ) {
 			return $error;
 		}
 
@@ -117,20 +106,17 @@ public function check_authentication_error( $error ) {
 
 	/**
 	 * Set authentication error.
-	 *
 	 * @since    1.0.0
 	 * @param WP_Error $error Authentication error data.
 	 */
 	protected function set_error( $error ) {
 		// Reset user.
 		$this->user = null;
-
 		$this->error = $error;
 	}
 
 	/**
 	 * Get authentication error.
-	 *
 	 * @since    1.0.0
 	 * @return WP_Error|null.
 	 */
@@ -155,19 +141,19 @@ private function perform_basic_authentication() {
 		$consumer_secret   = '';
 
 		// If the $_GET parameters are present, use those first.
-		if ( ! empty( $_GET['consumer_key'] ) && ! empty( $_GET['consumer_secret'] ) ) { // WPCS: CSRF ok.
+		if ( !empty( $_GET['consumer_key'] ) && !empty( $_GET['consumer_secret'] ) ) { // WPCS: CSRF ok.
 			$consumer_key    = sanitize_text_field($_GET['consumer_key']); // WPCS: CSRF ok, sanitization ok.
 			$consumer_secret = sanitize_text_field($_GET['consumer_secret']); // WPCS: CSRF ok, sanitization ok.
 		}
 
 		// If the above is not present, we will do full basic auth.
-		if ( ! $consumer_key && ! empty( $_SERVER['PHP_AUTH_USER'] ) && ! empty( $_SERVER['PHP_AUTH_PW'] ) ) {
+		if ( !$consumer_key && !empty( $_SERVER['PHP_AUTH_USER'] ) && !empty( $_SERVER['PHP_AUTH_PW'] ) ) {
 			$consumer_key    = sanitize_text_field($_SERVER['PHP_AUTH_USER']); // WPCS: CSRF ok, sanitization ok.
 			$consumer_secret = sanitize_text_field($_SERVER['PHP_AUTH_PW']); // WPCS: CSRF ok, sanitization ok.
 		}
 
 		// Stop if don't have any key.
-		if ( ! $consumer_key || ! $consumer_secret ) {
+		if ( !$consumer_key || ! $consumer_secret ) {
 			return false;
 		}
 
@@ -177,9 +163,8 @@ private function perform_basic_authentication() {
 			return false;
 		}
 
-
 		// Validate user secret.
-		if ( ! hash_equals( $this->user->consumer_secret, $consumer_secret ) ) { // @codingStandardsIgnoreLine
+		if ( !hash_equals( $this->user->consumer_secret, $consumer_secret ) ) { // @codingStandardsIgnoreLine
 			$this->set_error( new WP_Error( 'wpem_rest_authentication_error', __( 'Consumer secret is invalid.', 'wpem-rest-api' ), array( 'status' => 401 ) ) );
 
 			return false;
@@ -193,8 +178,6 @@ private function perform_basic_authentication() {
 
 			return false;
 		}
-
-
 		return $this->user->user_id;
 	}
 
@@ -210,7 +193,6 @@ public function parse_header( $header ) {
 		if ( 'OAuth ' !== substr( $header, 0, 6 ) ) {
 			return array();
 		}
-
 		// From OAuth PHP library, used under MIT license.
 		$params = array();
 		if ( preg_match_all( '/(oauth_[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches ) ) {
@@ -238,10 +220,9 @@ public function parse_header( $header ) {
 	 * @return string Authorization header if set.
 	 */
 	public function get_authorization_header() {
-		if ( ! empty( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
+		if ( !empty( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
 			return wp_unslash( $_SERVER['HTTP_AUTHORIZATION'] ); // WPCS: sanitization ok.
 		}
-
 		if ( function_exists( 'getallheaders' ) ) {
 			$headers = getallheaders();
 			// Check for the authoization header case-insensitively.
@@ -251,7 +232,6 @@ public function get_authorization_header() {
 				}
 			}
 		}
-
 		return '';
 	}
 
@@ -267,16 +247,14 @@ public function get_oauth_parameters() {
 		$params = wp_unslash( $params );
 		$header = $this->get_authorization_header();
 
-		if ( ! empty( $header ) ) {
+		if ( !empty( $header ) ) {
 			// Trim leading spaces.
 			$header        = trim( $header );
 			$header_params = $this->parse_header( $header );
-
-			if ( ! empty( $header_params ) ) {
+			if ( !empty( $header_params ) ) {
 				$params = array_merge( $params, $header_params );
 			}
 		}
-
 		$param_names = array(
 			'oauth_consumer_key',
 			'oauth_timestamp',
@@ -298,24 +276,21 @@ public function get_oauth_parameters() {
 		}
 
 		// All keys are missing, so we're probably not even trying to use OAuth.
-		if ( ! $have_one ) {
+		if ( !$have_one ) {
 			return array();
 		}
 
 		// If we have at least one supplied piece of data, and we have an error,
 		// then it's a failed authentication.
-		if ( ! empty( $errors ) ) {
+		if ( !empty( $errors ) ) {
 			$message = sprintf(
 				/* translators: %s: amount of errors */
 				_n( 'Missing OAuth parameter %s', 'Missing OAuth parameters %s', count( $errors ), 'wpem-rest-api' ),
 				implode( ', ', $errors )
 			);
-
 			$this->set_error( new WP_Error( 'wpem_rest_authentication_missing_parameter', $message, array( 'status' => 401 ) ) );
-
 			return array();
 		}
-
 		return $params;
 	}
 
@@ -391,7 +366,7 @@ private function check_oauth_signature( $user, $params ) {
 		unset( $params['oauth_signature'] );
 
 		// Sort parameters.
-		if ( ! uksort( $params, 'strcmp' ) ) {
+		if ( !uksort( $params, 'strcmp' ) ) {
 			return new WP_Error( 'wpem_rest_authentication_error', __( 'Invalid signature - failed to sort parameters.', 'wpem-rest-api' ), array( 'status' => 401 ) );
 		}
 
@@ -408,7 +383,7 @@ private function check_oauth_signature( $user, $params ) {
 		$secret         = $user->consumer_secret . '&';
 		$signature      = base64_encode( hash_hmac( $hash_algorithm, $string_to_sign, $secret, true ) );
 
-		if ( ! hash_equals( $signature, $consumer_signature ) ) { // @codingStandardsIgnoreLine
+		if ( !hash_equals( $signature, $consumer_signature ) ) { // @codingStandardsIgnoreLine
 			return new WP_Error( 'wpem_rest_authentication_error', __( 'Invalid signature - provided signature does not match.', 'wpem-rest-api' ), array( 'status' => 401 ) );
 		}
 
@@ -429,7 +404,6 @@ private function join_with_equals_sign( $params, $query_params = array(), $key =
 			if ( $key ) {
 				$param_key = $key . '%5B' . $param_key . '%5D'; // Handle multi-dimensional array.
 			}
-
 			if ( is_array( $param_value ) ) {
 				$query_params = $this->join_with_equals_sign( $param_value, $query_params, $param_key );
 			} else {
@@ -437,7 +411,6 @@ private function join_with_equals_sign( $params, $query_params = array(), $key =
 				$query_params[] = wpem_rest_api_urlencode_rfc3986( $string );
 			}
 		}
-
 		return $query_params;
 	}
 
@@ -464,7 +437,6 @@ private function normalize_parameters( $parameters ) {
 		$keys       = wpem_rest_api_urlencode_rfc3986( array_keys( $parameters ) );
 		$values     = wpem_rest_api_urlencode_rfc3986( array_values( $parameters ) );
 		$parameters = array_combine( $keys, $values );
-
 		return $parameters;
 	}
 
@@ -488,7 +460,6 @@ private function check_oauth_timestamp_and_nonce( $user, $timestamp, $nonce ) {
 		if ( ( $timestamp < time() - $valid_window ) || ( $timestamp > time() + $valid_window ) ) {
 			return new WP_Error( 'wpem_rest_authentication_error', __( 'Invalid timestamp.', 'wpem-rest-api' ), array( 'status' => 401 ) );
 		}
-
 		$used_nonces = maybe_unserialize( $user->nonces );
 
 		if ( empty( $used_nonces ) ) {
@@ -507,7 +478,6 @@ private function check_oauth_timestamp_and_nonce( $user, $timestamp, $nonce ) {
 				unset( $used_nonces[ $nonce_timestamp ] );
 			}
 		}
-
 		$used_nonces = maybe_serialize( $used_nonces );
 
 		$wpdb->update(
@@ -517,7 +487,6 @@ private function check_oauth_timestamp_and_nonce( $user, $timestamp, $nonce ) {
 			array( '%s' ),
 			array( '%d' )
 		);
-
 		return true;
 	}
 
@@ -529,17 +498,15 @@ private function check_oauth_timestamp_and_nonce( $user, $timestamp, $nonce ) {
 	 */
 	private function get_user_data_by_consumer_key( $consumer_key ) {
 		global $wpdb;
-
 		$consumer_key = sanitize_text_field( $consumer_key ); //NEED TO IMPROVE LATER WITH GLOBAL API
 
-		//$consumer_key = sanitize_text_field( $consumer_key );
 		$user         = $wpdb->get_row(
 			$wpdb->prepare(
 				"
-			SELECT `key_id`, `user_id`, `permissions`, `consumer_key`, `consumer_secret`, `nonces`,`date_expires`,`date_created`
-			FROM {$wpdb->prefix}wpem_rest_api_keys
-			WHERE consumer_key = %s
-		",
+					SELECT `key_id`, `user_id`, `permissions`, `consumer_key`, `consumer_secret`, `nonces`,`date_expires`,`date_created`
+					FROM {$wpdb->prefix}wpem_rest_api_keys
+					WHERE consumer_key = %s
+				",
 				$consumer_key
 			)
 		);
@@ -575,10 +542,6 @@ private function check_permissions( $method ) {
 			default:
 				return new WP_Error( 'wpem_rest_authentication_error', __( 'Unknown request method.', 'wpem-rest-api' ), array( 'status' => 401 ) );
 		}
-
-
-
-
 		return true;
 	}
 
@@ -610,7 +573,6 @@ public function send_unauthorized_headers( $response ) {
 			$auth_message = __( 'WPEM API. Use a consumer key in the username field and a consumer secret in the password field.', 'wpem-rest-api' );
 			$response->header( 'WWW-Authenticate', 'Basic realm="' . $auth_message . '"', true );
 		}
-
 		return $response;
 	}
 
@@ -629,11 +591,9 @@ public function check_user_permissions( $result, $server, $request ) {
 			if ( is_wp_error( $allowed ) ) {
 				return $allowed;
 			}
-
 			// Register last access.
 			$this->update_last_access();
 		}
-
 		return $result;
 	}
 
@@ -663,23 +623,21 @@ public function register_routes() {
 	 */
 	public function perform_login_authentication($request){
 		$response = [];
-		if(isset($_GET['username']) && isset($_GET['password']) && (!empty($_GET['username']) && !empty($_GET['password'])) ){
-			$username = sanitize_text_field($_GET['username']);
-			$password = sanitize_text_field($_GET['password']);
+		if( isset( $_GET['username'] ) && isset( $_GET['password'] ) && ( !empty( $_GET['username'] ) && !empty( $_GET['password'] ) ) ){
+			$username = sanitize_text_field( $_GET['username'] );
+			$password = sanitize_text_field( $_GET['password'] );
 
-			$user = wp_authenticate($username, $password);
+			$user = wp_authenticate( $username, $password) ;
 
-			if(!is_wp_error($user)){
-				$response =  array('success' => true,'message' => __('You are logged in successfully.','wpem-rest-api') );
-			}
-			else
-			{
-				$response =  array('success' => false,'message' => __('Username or password wrong.','wpem-rest-api') );
+			if( !is_wp_error( $user ) ){
+				$response =  array( 'success' => true,'message' => __( 'You are logged in successfully.','wpem-rest-api' ) );
+			} else {
+				$response =  array('success' => false,'message' => __( 'Username or password wrong.','wpem-rest-api' ) );
 			}
 		}
 
-		if(empty($response))
-			$response =  array('success' => false,'message' => __('Somethign went wrong.','wpem-rest-api') );
+		if( empty( $response ) )
+			$response =  array( 'success' => false, 'message' => __( 'Somethign went wrong.','wpem-rest-api' ) );
 
 		return $response;
 	}
@@ -689,30 +647,27 @@ public function perform_login_authentication($request){
 	 *
 	 * @since 1.0.0
 	 */
-	public function perform_app_key_authentication($request){
+	public function perform_app_key_authentication( $request ){
 		global $wpdb;
 
-		if(isset($_GET['key']) && !empty($_GET['key'])){
-			$app_key = sanitize_text_field($_GET['key']);
+		if( isset( $_GET['key'] ) && !empty( $_GET['key'] ) ){
+			$app_key = sanitize_text_field( $_GET['key'] );
 
-			$key_data         = $wpdb->get_row(
+			$key_data = $wpdb->get_row(
 				$wpdb->prepare(
 					"
-				SELECT key_id, app_key,user_id, permissions, consumer_key, consumer_secret, nonces
-				FROM {$wpdb->prefix}wpem_rest_api_keys
-				WHERE app_key = %s
-			",
+						SELECT key_id, app_key, user_id, permissions, consumer_key, consumer_secret, nonces
+						FROM {$wpdb->prefix}wpem_rest_api_keys
+						WHERE app_key = %s
+					",
 					$app_key
 				)
 			);
-
-			if(empty($key_data))
+			if( empty( $key_data ) )
 				$key_data = array( 'wpem_rest_authentication_error', __( 'Invalid APP ID.', 'wpem-rest-api' ), array( 'status' => 401 ) );
 
 			return $key_data;
-
 		}
 	}
 }
-
-new WPEM_REST_Authentication();
+new WPEM_REST_Authentication();
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-conroller.php b/includes/rest-api/wpem-rest-conroller.php
index df2a677..064b627 100644
--- a/includes/rest-api/wpem-rest-conroller.php
+++ b/includes/rest-api/wpem-rest-conroller.php
@@ -14,8 +14,7 @@
  * @class WPEM_REST_Controller
  * @see   https://developer.wordpress.org/rest-api/extending-the-rest-api/controller-classes/
  */
-
-if (! defined('ABSPATH') ) {
+if( !defined( 'ABSPATH' ) ) {
     exit;
 }
 
@@ -25,8 +24,7 @@
  * @extends WP_REST_Controller
  * @version 1.0.0
  */
-abstract class WPEM_REST_Controller extends WP_REST_Controller
-{
+abstract class WPEM_REST_Controller extends WP_REST_Controller {
 
     /**
      * Endpoint namespace.
@@ -53,9 +51,8 @@ abstract class WPEM_REST_Controller extends WP_REST_Controller
      *
      * @return array
      */
-    protected function add_additional_fields_schema( $schema )
-    {
-        if (empty($schema['title']) ) {
+    protected function add_additional_fields_schema( $schema ) {
+        if( empty( $schema['title']) ) {
             return $schema;
         }
 
@@ -63,19 +60,14 @@ protected function add_additional_fields_schema( $schema )
          * Can't use $this->get_object_type otherwise we cause an inf loop.
          */
         $object_type = $schema['title'];
-
-        $additional_fields = $this->get_additional_fields($object_type);
-
+        $additional_fields = $this->get_additional_fields( $object_type );
         foreach ( $additional_fields as $field_name => $field_options ) {
             if (! $field_options['schema'] ) {
                 continue;
             }
-
             $schema['properties'][ $field_name ] = $field_options['schema'];
         }
-
-        $schema['properties'] = apply_filters('wpem_rest_' . $object_type . '_schema', $schema['properties']);
-
+        $schema['properties'] = apply_filters( 'wpem_rest_' . $object_type . '_schema', $schema['properties'] );
         return $schema;
     }
 
@@ -85,8 +77,7 @@ protected function add_additional_fields_schema( $schema )
      * @since  1.0.0
      * @return string
      */
-    protected function get_normalized_rest_base()
-    {
+    protected function get_normalized_rest_base() {
         return preg_replace('/\(.*\)\//i', '', $this->rest_base);
     }
 
@@ -97,28 +88,26 @@ protected function get_normalized_rest_base()
      * @param  array $items Request items.
      * @return bool|WP_Error
      */
-    protected function check_batch_limit( $items )
-    {
-        $limit = apply_filters('wpem_rest_batch_items_limit', 100, $this->get_normalized_rest_base());
+    protected function check_batch_limit( $items ) {
+        $limit = apply_filters( 'wpem_rest_batch_items_limit', 100, $this->get_normalized_rest_base() );
         $total = 0;
 
-        if (! empty($items['create']) ) {
-            $total += count($items['create']);
+        if( !empty( $items['create'] ) ) {
+            $total += count( $items['create'] );
         }
 
-        if (! empty($items['update']) ) {
-            $total += count($items['update']);
+        if( !empty($items['update'] ) ) {
+            $total += count( $items['update'] );
         }
 
-        if (! empty($items['delete']) ) {
-            $total += count($items['delete']);
+        if( !empty( $items['delete']) ) {
+            $total += count( $items['delete'] );
         }
 
-        if ($total > $limit ) {
+        if( $total > $limit ) {
             /* translators: %s: items limit */
-            return new WP_Error('wpem_rest_request_entity_too_large', sprintf(__('Unable to accept more than %s items for this request.', 'wpem-rest-api'), $limit), array( 'status' => 413 ));
+            return new WP_Error( 'wpem_rest_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'wpem-rest-api' ), $limit ), array( 'status' => 413 ) );
         }
-
         return true;
     }
 
@@ -129,8 +118,7 @@ protected function check_batch_limit( $items )
      * @param  WP_REST_Request $request Full details about the request.
      * @return array Of WP_Error or WP_REST_Response.
      */
-    public function batch_items( $request )
-    {
+    public function batch_items( $request ) {
         /**
          * REST Server
          *
@@ -139,39 +127,39 @@ public function batch_items( $request )
         global $wp_rest_server;
 
         // Get the request params.
-        $items    = array_filter($request->get_params());
+        $items    = array_filter( $request->get_params() );
         $query    = $request->get_query_params();
         $response = array();
 
         // Check batch limit.
-        $limit = $this->check_batch_limit($items);
-        if (is_wp_error($limit) ) {
+        $limit = $this->check_batch_limit( $items );
+        if( is_wp_error( $limit ) ) {
             return $limit;
         }
 
-        if (! empty($items['create']) ) {
-            foreach ( $items['create'] as $item ) {
+        if( !empty( $items['create'] ) ) {
+            foreach( $items['create'] as $item ) {
                 $_item = new WP_REST_Request('POST');
 
                 // Default parameters.
                 $defaults = array();
                 $schema   = $this->get_public_item_schema();
-                foreach ( $schema['properties'] as $arg => $options ) {
-                    if (isset($options['default']) ) {
+                foreach( $schema['properties'] as $arg => $options ) {
+                    if( isset($options['default']) ) {
                         $defaults[ $arg ] = $options['default'];
                     }
                 }
-                $_item->set_default_params($defaults);
+                $_item->set_default_params( $defaults );
 
                 // Set request parameters.
-                $_item->set_body_params($item);
+                $_item->set_body_params( $item );
 
                 // Set query (GET) parameters.
-                $_item->set_query_params($query);
+                $_item->set_query_params( $query );
 
-                $_response = $this->create_item($_item);
+                $_response = $this->create_item( $_item );
 
-                if (is_wp_error($_response) ) {
+                if( is_wp_error( $_response ) ) {
                     $response['create'][] = array(
                     'id'    => 0,
                     'error' => array(
@@ -181,64 +169,63 @@ public function batch_items( $request )
                     ),
                     );
                 } else {
-                    $response['create'][] = $wp_rest_server->response_to_data($_response, '');
+                    $response['create'][] = $wp_rest_server->response_to_data( $_response, '' );
                 }
             }
         }
 
-        if (! empty($items['update']) ) {
-            foreach ( $items['update'] as $item ) {
+        if( !empty( $items['update'] ) ) {
+            foreach( $items['update'] as $item ) {
                 $_item = new WP_REST_Request('PUT');
                 $_item->set_body_params($item);
                 $_response = $this->update_item($_item);
 
-                if (is_wp_error($_response) ) {
+                if( is_wp_error( $_response ) ) {
                     $response['update'][] = array(
-                     'id'    => $item['id'],
-                     'error' => array(
-                      'code'    => $_response->get_error_code(),
-                      'message' => $_response->get_error_message(),
-                      'data'    => $_response->get_error_data(),
-                     ),
+                        'id'    => $item['id'],
+                        'error' => array(
+                        'code'    => $_response->get_error_code(),
+                        'message' => $_response->get_error_message(),
+                        'data'    => $_response->get_error_data(),
+                        ),
                     );
                 } else {
-                    $response['update'][] = $wp_rest_server->response_to_data($_response, '');
+                    $response['update'][] = $wp_rest_server->response_to_data( $_response, '' );
                 }
             }
         }
 
-        if (! empty($items['delete']) ) {
-            foreach ( $items['delete'] as $id ) {
+        if( !empty( $items['delete'] ) ) {
+            foreach( $items['delete'] as $id ) {
                 $id = (int) $id;
 
-                if (0 === $id ) {
+                if( 0 === $id ) {
                     continue;
                 }
 
-                $_item = new WP_REST_Request('DELETE');
+                $_item = new WP_REST_Request( 'DELETE' );
                 $_item->set_query_params(
                     array(
-                    'id'    => $id,
-                    'force' => true,
+                        'id'    => $id,
+                        'force' => true,
                     )
                 );
-                $_response = $this->delete_item($_item);
+                $_response = $this->delete_item( $_item );
 
-                if (is_wp_error($_response) ) {
+                if( is_wp_error( $_response ) ) {
                        $response['delete'][] = array(
-                        'id'    => $id,
-                        'error' => array(
-                         'code'    => $_response->get_error_code(),
-                         'message' => $_response->get_error_message(),
-                         'data'    => $_response->get_error_data(),
-                        ),
+                            'id'    => $id,
+                            'error' => array(
+                                'code'    => $_response->get_error_code(),
+                                'message' => $_response->get_error_message(),
+                                'data'    => $_response->get_error_data(),
+                            ),
                        );
                 } else {
-                    $response['delete'][] = $wp_rest_server->response_to_data($_response, '');
+                    $response['delete'][] = $wp_rest_server->response_to_data( $_response, '' );
                 }
             }
         }
-
         return $response;
     }
 
@@ -250,10 +237,9 @@ public function batch_items( $request )
      * @param  array  $setting Setting.
      * @return string
      */
-    public function validate_setting_text_field( $value, $setting )
-    {
-        $value = is_null($value) ? '' : $value;
-        return wp_kses_post(trim(stripslashes($value)));
+    public function validate_setting_text_field( $value, $setting ) {
+        $value = is_null( $value ) ? '' : $value;
+        return wp_kses_post( trim( stripslashes( $value ) ) );
     }
 
     /**
@@ -264,12 +250,11 @@ public function validate_setting_text_field( $value, $setting )
      * @param  array  $setting Setting.
      * @return string|WP_Error
      */
-    public function validate_setting_select_field( $value, $setting )
-    {
-        if (array_key_exists($value, $setting['options']) ) {
+    public function validate_setting_select_field( $value, $setting ) {
+        if( array_key_exists( $value, $setting['options'] ) ) {
             return $value;
         } else {
-            return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'wpem-rest-api'), array( 'status' => 400 ));
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'wpem-rest-api' ), array( 'status' => 400 ) );
         }
     }
 
@@ -281,23 +266,21 @@ public function validate_setting_select_field( $value, $setting )
      * @param  array $setting Setting.
      * @return array|WP_Error
      */
-    public function validate_setting_multiselect_field( $values, $setting )
-    {
-        if (empty($values) ) {
+    public function validate_setting_multiselect_field( $values, $setting ) {
+        if( empty( $values ) ) {
             return array();
         }
 
-        if (! is_array($values) ) {
-            return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'wpem-rest-api'), array( 'status' => 400 ));
+        if( !is_array( $values ) ) {
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'wpem-rest-api' ), array( 'status' => 400 ) );
         }
 
         $final_values = array();
-        foreach ( $values as $value ) {
-            if (array_key_exists($value, $setting['options']) ) {
+        foreach( $values as $value ) {
+            if( array_key_exists( $value, $setting['options'] ) ) {
                 $final_values[] = $value;
             }
         }
-
         return $final_values;
     }
 
@@ -309,10 +292,9 @@ public function validate_setting_multiselect_field( $values, $setting )
      * @param  array $setting Setting.
      * @return string|WP_Error
      */
-    public function validate_setting_image_width_field( $values, $setting )
-    {
-        if (! is_array($values) ) {
-            return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'wpem-rest-api'), array( 'status' => 400 ));
+    public function validate_setting_image_width_field( $values, $setting ) {
+        if( !is_array( $values ) ) {
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'wpem-rest-api' ), array( 'status' => 400 ));
         }
 
         $current = $setting['value'];
@@ -336,9 +318,8 @@ public function validate_setting_image_width_field( $values, $setting )
      * @param  array  $setting Setting.
      * @return string|WP_Error
      */
-    public function validate_setting_radio_field( $value, $setting )
-    {
-        return $this->validate_setting_select_field($value, $setting);
+    public function validate_setting_radio_field( $value, $setting ) {
+        return $this->validate_setting_select_field( $value, $setting );
     }
 
     /**
@@ -349,15 +330,14 @@ public function validate_setting_radio_field( $value, $setting )
      * @param  array  $setting Setting.
      * @return string|WP_Error
      */
-    public function validate_setting_checkbox_field( $value, $setting )
-    {
-        if (in_array($value, array( 'yes', 'no' )) ) {
+    public function validate_setting_checkbox_field( $value, $setting ) {
+        if( in_array( $value, array( 'yes', 'no' ) ) ) {
             return $value;
-        } elseif (empty($value) ) {
-            $value = isset($setting['default']) ? $setting['default'] : 'no';
+        } elseif( empty( $value ) ) {
+            $value = isset( $setting['default'] ) ? $setting['default'] : 'no';
             return $value;
         } else {
-            return new WP_Error('rest_setting_value_invalid', __('An invalid setting value was passed.', 'wpem-rest-api'), array( 'status' => 400 ));
+            return new WP_Error( 'rest_setting_value_invalid', __( 'An invalid setting value was passed.', 'wpem-rest-api' ), array( 'status' => 400 ));
         }
     }
 
@@ -369,21 +349,20 @@ public function validate_setting_checkbox_field( $value, $setting )
      * @param  array  $setting Setting.
      * @return string
      */
-    public function validate_setting_textarea_field( $value, $setting )
-    {
-        $value = is_null($value) ? '' : $value;
+    public function validate_setting_textarea_field( $value, $setting ) {
+        $value = is_null( $value ) ? '' : $value;
         return wp_kses(
-            trim(stripslashes($value)),
+            trim( stripslashes( $value ) ),
             array_merge(
                 array(
-                'iframe' => array(
-                'src'   => true,
-                'style' => true,
-                'id'    => true,
-                'class' => true,
+                    'iframe' => array(
+                    'src'   => true,
+                    'style' => true,
+                    'id'    => true,
+                    'class' => true,
                     ),
                 ),
-                wp_kses_allowed_html('post')
+                wp_kses_allowed_html( 'post' )
             )
         );
     }
@@ -396,12 +375,10 @@ public function validate_setting_textarea_field( $value, $setting )
      * @param  array $meta_query Meta query.
      * @return array
      */
-    protected function add_meta_query( $args, $meta_query )
-    {
-        if (empty($args['meta_query']) ) {
+    protected function add_meta_query( $args, $meta_query ) {
+        if( empty($args['meta_query'] ) ) {
             $args['meta_query'] = array();
         }
-
         $args['meta_query'][] = $meta_query;
 
         return $args['meta_query'];
@@ -413,40 +390,38 @@ protected function add_meta_query( $args, $meta_query )
      * @since  1.0.0
      * @return array
      */
-    public function get_public_batch_schema()
-    {
+    public function get_public_batch_schema() {
         $schema = array(
-        '$schema'    => 'http://json-schema.org/draft-04/schema#',
-        'title'      => 'batch',
-        'type'       => 'object',
-        'properties' => array(
-        'create' => array(
-        'description' => __('List of created resources.', 'wpem-rest-api'),
-        'type'        => 'array',
-        'context'     => array( 'view', 'edit' ),
-        'items'       => array(
-         'type'    => 'object',
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'batch',
+            'type'       => 'object',
+            'properties' => array(
+                'create' => array(
+                    'description' => __( 'List of created resources.', 'wpem-rest-api' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                    'items'       => array(
+                        'type'    => 'object',
                     ),
-        ),
-        'update' => array(
-                    'description' => __('List of updated resources.', 'wpem-rest-api'),
+                ),
+                'update' => array(
+                    'description' => __( 'List of updated resources.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'    => 'object',
-        ),
-        ),
-        'delete' => array(
-                    'description' => __('List of delete resources.', 'wpem-rest-api'),
+                    ),
+                ),
+                'delete' => array(
+                    'description' => __( 'List of delete resources.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'    => 'integer',
-        ),
-        ),
-        ),
+                    ),
+                ),
+            ),
         );
-
         return $schema;
     }
 
@@ -460,58 +435,57 @@ public function get_public_batch_schema()
      * @param  WP_REST_Request $request Full details about the request.
      * @return array Fields to be included in the response.
      */
-    public function get_fields_for_response( $request )
-    {
+    public function get_fields_for_response( $request ) {
         $schema     = $this->get_item_schema();
-        $properties = isset($schema['properties']) ? $schema['properties'] : array();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
 
         $additional_fields = $this->get_additional_fields();
-        foreach ( $additional_fields as $field_name => $field_options ) {
+        foreach( $additional_fields as $field_name => $field_options ) {
             // For back-compat, include any field with an empty schema
             // because it won't be present in $this->get_item_schema().
-            if (is_null($field_options['schema']) ) {
+            if( is_null( $field_options['schema'] ) ) {
                 $properties[ $field_name ] = $field_options;
             }
         }
 
         // Exclude fields that specify a different context than the request context.
         $context = $request['context'];
-        if ($context ) {
-            foreach ( $properties as $name => $options ) {
-                if (! empty($options['context']) && ! in_array($context, $options['context'], true) ) {
-                    unset($properties[ $name ]);
+        if( $context ) {
+            foreach( $properties as $name => $options ) {
+                if( !empty( $options['context'] ) && !in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
                 }
             }
         }
 
-        $fields = array_keys($properties);
+        $fields = array_keys( $properties );
 
-        if (! isset($request['_fields']) ) {
+        if( !isset( $request['_fields'] ) ) {
             return $fields;
         }
-        $requested_fields = wp_parse_list($request['_fields']);
-        if (0 === count($requested_fields) ) {
+        $requested_fields = wp_parse_list( $request['_fields'] );
+        if( 0 === count( $requested_fields ) ) {
             return $fields;
         }
         // Trim off outside whitespace from the comma delimited list.
         $requested_fields = array_map('trim', $requested_fields);
         // Always persist 'id', because it can be needed for add_additional_fields_to_object().
-        if (in_array('id', $fields, true) ) {
+        if( in_array( 'id', $fields, true ) ) {
             $requested_fields[] = 'id';
         }
         // Return the list of all requested fields which appear in the schema.
         return array_reduce(
             $requested_fields,
-            function ( $response_fields, $field ) use ( $fields ) {
-                if (in_array($field, $fields, true) ) {
+            function( $response_fields, $field ) use ( $fields ) {
+                if( in_array( $field, $fields, true ) ) {
                     $response_fields[] = $field;
                     return $response_fields;
                 }
                 // Check for nested fields if $field is not a direct match.
-                $nested_fields = explode('.', $field);
+                $nested_fields = explode( '.', $field );
                 // A nested field is included so long as its top-level property is
                 // present in the schema.
-                if (in_array($nested_fields[0], $fields, true) ) {
+                if( in_array( $nested_fields[0], $fields, true ) ) {
                     $response_fields[] = $field;
                 }
                 return $response_fields;
@@ -519,6 +493,4 @@ function ( $response_fields, $field ) use ( $fields ) {
             array()
         );
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-crud-controller.php b/includes/rest-api/wpem-rest-crud-controller.php
index 179b502..db00731 100644
--- a/includes/rest-api/wpem-rest-crud-controller.php
+++ b/includes/rest-api/wpem-rest-crud-controller.php
@@ -5,8 +5,7 @@
  * @class   WPEM_REST_CRUD_Controller
  * @version 1.0.0
  */
-
-if (! defined('ABSPATH') ) {
+if( !defined('ABSPATH') ) {
     exit;
 }
 
@@ -15,8 +14,7 @@
  *
  * @extends WPEM_REST_Posts_Controller
  */
-abstract class WPEM_REST_CRUD_Controller extends WPEM_REST_Posts_Controller
-{
+abstract class WPEM_REST_CRUD_Controller extends WPEM_REST_Posts_Controller {
 
     /**
      * Endpoint namespace.
@@ -40,11 +38,9 @@ abstract class WPEM_REST_CRUD_Controller extends WPEM_REST_Posts_Controller
      */
     protected function get_object( $id ) {
         // translators: %s: Class method name.
-        return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api'), __METHOD__), array( 'status' => 405 ));
+        return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api' ), __METHOD__ ), array( 'status' => 405 ) );
     }
 
-
-
     /**
      * Check if a given request has access to read an item.
      *
@@ -52,15 +48,15 @@ protected function get_object( $id ) {
      * @return WP_Error|boolean
      */
     public function get_item_permissions_check( $request ) {
-        $object = $this->get_object((int) $request['id']);
-		if (!is_wp_error($object) && $object) {
+        $object = $this->get_object( (int) $request['id'] );
+		if( !is_wp_error( $object ) && $object ) {
 			$object_id = $object->ID;
-			if ($object->post_type === 'product') {
+			if( $object->post_type === 'product' ) {
 				$object_id = $object->get_id();
 			}
 
-			if (0 == $object_id && ! wpem_rest_api_check_post_permissions($this->post_type, 'read', $object_id) ) {
-				return new WP_Error('wpem_rest_cannot_view', __('Sorry, you cannot view this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+			if( 0 == $object_id && !wpem_rest_api_check_post_permissions( $this->post_type, 'read', $object_id ) ) {
+				return new WP_Error( 'wpem_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
 			}
 			return true;
 		} else {
@@ -75,11 +71,11 @@ public function get_item_permissions_check( $request ) {
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|boolean
      */
-    public function update_item_permissions_check($request) {
-        $object = $this->get_object((int) $request['id']);
-	    if (!is_wp_error($object) && $object) {
-	        if ($object && 0 !== $object->ID && ! wpem_rest_api_check_post_permissions($this->post_type, 'edit', $object->ID) ) {
-		        return new WP_Error('wpem_rest_cannot_edit', __('Sorry, you are not allowed to edit this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+    public function update_item_permissions_check( $request ) {
+        $object = $this->get_object( (int) $request['id'] );
+	    if( !is_wp_error( $object ) && $object ) {
+	        if( $object && 0 !== $object->ID && ! wpem_rest_api_check_post_permissions( $this->post_type, 'edit', $object->ID ) ) {
+		        return new WP_Error( 'wpem_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
 	        }
 	        return true;
         } else {
@@ -95,10 +91,10 @@ public function update_item_permissions_check($request) {
      * @return bool|WP_Error
      */
     public function delete_item_permissions_check( $request ) {
-        $object = $this->get_object((int) $request['id']);
-	    if (!is_wp_error($object) && $object) {
-		    if ($object && 0 !== $object->ID && ! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $object->ID) ) {
-			    return new WP_Error('wpem_rest_cannot_delete', __('Sorry, you are not allowed to delete this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+        $object = $this->get_object( (int) $request['id'] );
+	    if( !is_wp_error( $object ) && $object ) {
+		    if( $object && 0 !== $object->ID && ! wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $object->ID ) ) {
+			    return new WP_Error( 'wpem_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
 		    }
 		    return true;
 	    } else {
@@ -113,8 +109,7 @@ public function delete_item_permissions_check( $request ) {
      * @param  object $object Object.
      * @return string
      */
-    protected function get_permalink( $object )
-    {
+    protected function get_permalink( $object ) {
         return '';
     }
 
@@ -126,10 +121,9 @@ protected function get_permalink( $object )
      * @param  WP_REST_Request $request Request object.
      * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
      */
-    protected function prepare_object_for_response( $object, $request )
-    {
+    protected function prepare_object_for_response( $object, $request ) {
         // translators: %s: Class method name.
-        return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api'), __METHOD__), array( 'status' => 405 ));
+        return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api' ), __METHOD__ ), array( 'status' => 405 ) );
     }
 
     /**
@@ -140,10 +134,9 @@ protected function prepare_object_for_response( $object, $request )
      * @param  bool            $creating If is creating a new object.
      * @return WP_Error|Post Data The prepared item, or WP_Error object on failure.
      */
-    protected function prepare_object_for_database( $request, $creating = false )
-    {
+    protected function prepare_object_for_database( $request, $creating = false ) {
         // translators: %s: Class method name.
-        return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api'), __METHOD__), array( 'status' => 405 ));
+        return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass.", 'wpem-rest-api' ), __METHOD__ ), array( 'status' => 405 ) );
     }
 
     /**
@@ -153,16 +146,16 @@ protected function prepare_object_for_database( $request, $creating = false )
      * @return WP_Error|WP_REST_Response
      */
     public function get_item( $request ) {
-        $object = $this->get_object((int) $request['id']);
-	    if (! $object || 0 === $object->ID ) {
-            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('Invalid ID.', 'wpem-rest-api'), array( 'status' => 404 ));
+        $object = $this->get_object( (int) $request['id'] );
+	    if( !$object || 0 === $object->ID ) {
+            return new WP_Error( "wpem_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'wpem-rest-api' ), array( 'status' => 404 ) );
         }
 
         $data     = $this->prepare_object_for_response($object, $request);
         $response = rest_ensure_response($data);
 
-        if ($this->public ) {
-            $response->link_header('alternate', $this->get_permalink($object), array( 'type' => 'text/html' ));
+        if( $this->public ) {
+            $response->link_header( 'alternate', $this->get_permalink( $object ), array( 'type' => 'text/html' ) );
         }
 
         return $response;
@@ -178,14 +171,14 @@ public function get_item( $request ) {
      */
     protected function save_object( $request, $creating = false ) {
         try {
-            $object = $this->prepare_object_for_database($request, $creating);
+            $object = $this->prepare_object_for_database( $request, $creating );
 
-            if (is_wp_error($object) ) {
+            if( is_wp_error( $object ) ) {
                 return $object;
             }
-            return $this->get_object($object->ID);
-        } catch ( Exception $e ) {
-            return new WP_Error($e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ));
+            return $this->get_object( $object->ID );
+        } catch( Exception $e ) {
+            return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ));
         }
     }
 
@@ -195,39 +188,37 @@ protected function save_object( $request, $creating = false ) {
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function create_item( $request )
-    {
-        if (! empty($request['id']) ) {
+    public function create_item( $request ) {
+        if( !empty( $request['id'] ) ) {
             /* translators: %s: post type */
-            return new WP_Error("wpem_rest_{$this->post_type}_exists", sprintf(__('Cannot create existing %s.', 'wpem-rest-api'), $this->post_type), array( 'status' => 400 ));
+            return new WP_Error( "wpem_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 400 ) );
         }
 
         $object = $this->save_object($request, true);
 
-        if (is_wp_error($object) ) {
+        if( is_wp_error( $object ) ) {
             return $object;
         }
 
         try {
-            $this->update_additional_fields_for_object($object, $request);
-
+            $this->update_additional_fields_for_object( $object, $request );
             /**
              * Fires after a single object is created or updated via the REST API.
              *
              * @param WP_REST_Request $request   Request object.
              * @param boolean         $creating  True when creating object, false when updating.
              */
-            do_action("wpem_rest_insert_{$this->post_type}_object", $object, $request, true);
-        } catch ( Exception $e ) {
-            wp_delete_post($object->ID);
-            return new WP_Error($e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ));
+            do_action( "wpem_rest_insert_{$this->post_type}_object", $object, $request, true );
+        } catch( Exception $e ) {
+            wp_delete_post( $object->ID );
+            return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_object_for_response($object, $request);
-        $response = rest_ensure_response($response);
-        $response->set_status(201);
-        $response->header('Location', rest_url(sprintf('/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID)));
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_object_for_response( $object, $request );
+        $response = rest_ensure_response( $response );
+        $response->set_status( 201 );
+        $response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ) );
 
         return $response;
     }
@@ -238,24 +229,21 @@ public function create_item( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function update_item( $request )
-    {
-        $object = $this->get_object((int) $request['id']);
+    public function update_item( $request ) {
+        $object = $this->get_object( (int) $request['id'] );
 
-        if (! $object || 0 === $object->ID ) {
-            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('Invalid ID.', 'wpem-rest-api'), array( 'status' => 400 ));
+        if( !$object || 0 === $object->ID ) {
+            return new WP_Error( "wpem_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'wpem-rest-api' ), array( 'status' => 400 ) );
         }
 
         $object = $this->save_object($request, false);
 
-        if (is_wp_error($object) ) {
+        if( is_wp_error( $object ) ) {
             return $object;
         }
 
         try {
-            $this->update_additional_fields_for_object($object, $request);
-
-
+            $this->update_additional_fields_for_object( $object, $request );
             /**
              * Fires after a single object is created or updated via the REST API.
              *
@@ -263,14 +251,14 @@ public function update_item( $request )
              * @param WP_REST_Request $request   Request object.
              * @param boolean         $creating  True when creating object, false when updating.
              */
-            do_action("wpem_rest_insert_{$this->post_type}_object", $object, $request, false);
+            do_action("wpem_rest_insert_{$this->post_type}_object", $object, $request, false );
         } catch ( Exception $e ) {
-            return new WP_Error($e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ));
+            return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_object_for_response($object, $request);
-        return rest_ensure_response($response);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_object_for_response( $object, $request );
+        return rest_ensure_response( $response );
     }
 
     /**
@@ -280,8 +268,7 @@ public function update_item( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return array
      */
-    protected function prepare_objects_query( $request )
-    {
+    protected function prepare_objects_query( $request ) {
         $args                        = array();
         $args['offset']              = $request['offset'];
         $args['order']               = $request['order'];
@@ -296,18 +283,18 @@ protected function prepare_objects_query( $request )
         $args['post_parent__not_in'] = $request['parent_exclude'];
         $args['s']                   = $request['search'];
 
-        if ('date' === $args['orderby'] ) {
+        if( 'date' === $args['orderby'] ) {
             $args['orderby'] = 'date ID';
         }
 
         $args['date_query'] = array();
         // Set before into date query. Date query must be specified as an array of an array.
-        if (isset($request['before']) ) {
+        if( isset( $request['before'] ) ) {
             $args['date_query'][0]['before'] = $request['before'];
         }
 
         // Set after into date query. Date query must be specified as an array of an array.
-        if (isset($request['after']) ) {
+        if( isset( $request['after'] ) ) {
             $args['date_query'][0]['after'] = $request['after'];
         }
 
@@ -323,9 +310,9 @@ protected function prepare_objects_query( $request )
          * @param array           $args    Key value array of query var to query value.
          * @param WP_REST_Request $request The request used.
          */
-        $args = apply_filters("wpem_rest_{$this->post_type}_object_query", $args, $request);
+        $args = apply_filters( "wpem_rest_{$this->post_type}_object_query", $args, $request );
 
-        return $this->prepare_items_query($args, $request);
+        return $this->prepare_items_query( $args, $request );
     }
 
     /**
@@ -336,13 +323,12 @@ protected function prepare_objects_query( $request )
      * @param  WP_REST_Request $request       Request object.
      * @return array          $query_args
      */
-    protected function prepare_items_query( $prepared_args = array(), $request = null )
-    {
+    protected function prepare_items_query( $prepared_args = array(), $request = null ) {
 
-        $valid_vars = array_flip($this->get_allowed_query_vars());
+        $valid_vars = array_flip( $this->get_allowed_query_vars() );
         $query_args = array();
         foreach ( $valid_vars as $var => $index ) {
-            if (isset($prepared_args[ $var ]) ) {
+            if( isset( $prepared_args[ $var ] ) ) {
                 /**
                  * Filter the query_vars used in `get_items` for the constructed query.
                  *
@@ -350,19 +336,18 @@ protected function prepare_items_query( $prepared_args = array(), $request = nul
                  *
                  * @param mixed $prepared_args[ $var ] The query_var value.
                  */
-                $query_args[ $var ] = apply_filters("wpem_rest_query_var-{$var}", $prepared_args[ $var ]);
+                $query_args[ $var ] = apply_filters( "wpem_rest_query_var-{$var}", $prepared_args[ $var ] );
             }
         }
         $query_args['ignore_sticky_posts'] = true;
 
-        if ('include' === $query_args['orderby'] ) {
+        if( 'include' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'post__in';
-        } elseif ('id' === $query_args['orderby'] ) {
+        } elseif ( 'id' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'ID'; // ID must be capitalized.
-        } elseif ('slug' === $query_args['orderby'] ) {
+        } elseif ( 'slug' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'name';
         }
-
         return $query_args;
     }
 
@@ -373,24 +358,23 @@ protected function prepare_items_query( $prepared_args = array(), $request = nul
      * @param  array $query_args Query args.
      * @return array
      */
-    protected function get_objects( $query_args )
-    {
+    protected function get_objects( $query_args ) {
         $query  = new WP_Query();
-        $result = $query->query($query_args);
+        $result = $query->query( $query_args );
 
         $total_posts = $query->found_posts;
-        if ($total_posts < 1 ) {
+        if( $total_posts < 1 ) {
             // Out-of-bounds, run the query again without LIMIT for total count.
-            unset($query_args['paged']);
+            unset( $query_args['paged'] );
             $count_query = new WP_Query();
-            $count_query->query($query_args);
+            $count_query->query( $query_args );
             $total_posts = $count_query->found_posts;
         }
 
         return array(
-        'objects' => array_filter(array_map(array( $this, 'get_object' ), $result)),
-        'total'   => (int) $total_posts,
-        'pages'   => (int) ceil($total_posts / (int) $query->query_vars['posts_per_page']),
+            'objects' => array_filter( array_map( array( $this, 'get_object' ), $result ) ),
+            'total'   => (int) $total_posts,
+            'pages'   => (int) ceil( $total_posts / (int) $query->query_vars['posts_per_page'] ),
         );
     }
 
@@ -401,64 +385,62 @@ protected function get_objects( $query_args )
      * @return WP_Error|WP_REST_Response
      */
     public function get_items( $request ) {
-        $query_args    = $this->prepare_objects_query($request);
-        $query_results = $this->get_objects($query_args);
+        $query_args    = $this->prepare_objects_query( $request );
+        $query_results = $this->get_objects( $query_args );
 
         $objects = array();
         foreach ( $query_results['objects'] as $object ) {
 
-            if(!isset($object->ID)) {
+            if( !isset( $object->ID ) ) {
                 $object_id = $object->get_id();
             } else {
                 $object_id = $object->ID;
             }
 
-            if (! wpem_rest_api_check_post_permissions($this->post_type, 'read', $object_id) ) {
+            if( !wpem_rest_api_check_post_permissions( $this->post_type, 'read', $object_id ) ) {
                 continue;
             }
 
-            $data = $this->prepare_object_for_response($object, $request);
-            $objects[] = $this->prepare_response_for_collection($data);
+            $data = $this->prepare_object_for_response( $object, $request );
+            $objects[] = $this->prepare_response_for_collection( $data );
         }
 
         $page      = (int) $query_args['paged'];
         $max_pages = $query_results['pages'];
 
-        $response = rest_ensure_response($objects);
-        $response->header('X-WP-Total', $query_results['total']);
-        $response->header('X-WP-TotalPages', (int) $max_pages);
+        $response = rest_ensure_response( $objects );
+        $response->header( 'X-WP-Total', $query_results['total'] );
+        $response->header( 'X-WP-TotalPages', (int) $max_pages );
 
         $base          = $this->rest_base;
         $attrib_prefix = '(?P<';
-        if (strpos($base, $attrib_prefix) !== false ) {
+        if( strpos( $base, $attrib_prefix ) !== false ) {
             $attrib_names = array();
-            preg_match('/\(\?P<[^>]+>.*\)/', $base, $attrib_names, PREG_OFFSET_CAPTURE);
+            preg_match('/\(\?P<[^>]+>.*\)/', $base, $attrib_names, PREG_OFFSET_CAPTURE );
             foreach ( $attrib_names as $attrib_name_match ) {
-                $beginning_offset = strlen($attrib_prefix);
-                $attrib_name_end  = strpos($attrib_name_match[0], '>', $attrib_name_match[1]);
-                $attrib_name      = substr($attrib_name_match[0], $beginning_offset, $attrib_name_end - $beginning_offset);
-                if (isset($request[ $attrib_name ]) ) {
-                    $base  = str_replace("(?P<$attrib_name>[\d]+)", $request[ $attrib_name ], $base);
+                $beginning_offset = strlen( $attrib_prefix );
+                $attrib_name_end  = strpos( $attrib_name_match[0], '>', $attrib_name_match[1] );
+                $attrib_name      = substr( $attrib_name_match[0], $beginning_offset, $attrib_name_end - $beginning_offset );
+                if( isset( $request[ $attrib_name ] ) ) {
+                    $base  = str_replace( "(?P<$attrib_name>[\d]+)", $request[ $attrib_name ], $base );
                 }
             }
         }
-        $base = add_query_arg($request->get_query_params(), rest_url(sprintf('/%s/%s', $this->namespace, $base)));
+        $base = add_query_arg( $request->get_query_params(), rest_url( sprintf( '/%s/%s', $this->namespace, $base ) ) );
 
-        if ($page > 1 ) {
+        if( $page > 1 ) {
             $prev_page = $page - 1;
-            if ($prev_page > $max_pages ) {
+            if( $prev_page > $max_pages ) {
                 $prev_page = $max_pages;
             }
-            $prev_link = add_query_arg('page', $prev_page, $base);
-            $response->link_header('prev', $prev_link);
+            $prev_link = add_query_arg( 'page', $prev_page, $base );
+            $response->link_header( 'prev', $prev_link );
         }
-        if ($max_pages > $page ) {
+        if( $max_pages > $page ) {
             $next_page = $page + 1;
-            $next_link = add_query_arg('page', $next_page, $base);
-            $response->link_header('next', $next_link);
+            $next_link = add_query_arg( 'page', $next_page, $base );
+            $response->link_header( 'next', $next_link );
         }
-
-
         return $response;
     }
 
@@ -471,11 +453,11 @@ public function get_items( $request ) {
     public function delete_item( $request ) {
         $force  = isset( $request["force"] ) && (bool) $request['force'];
 
-        $object = $this->get_object((int) $request['id']);
+        $object = $this->get_object( (int) $request['id']);
         $result = false;
 
-        if (! $object || 0 === $object->ID ) {
-            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('Invalid ID.', 'wpem-rest-api'), array( 'status' => 404 ));
+        if( !$object || 0 === $object->ID ) {
+            return new WP_Error( "wpem_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'wpem-rest-api' ), array( 'status' => 404 ) );
         }
 
         $supports_trash = EMPTY_TRASH_DAYS > 0;
@@ -488,30 +470,30 @@ public function delete_item( $request ) {
          * @param boolean $supports_trash Whether the object type support trashing.
          * @param Post Data $object         The object being considered for trashing support.
          */
-        $supports_trash = apply_filters("wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object);
+        $supports_trash = apply_filters( "wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
 
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $object->ID) ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $object->ID ) ) {
             /* translators: %s: post type */
-            return new WP_Error("wpem_rest_user_cannot_delete_{$this->post_type}", sprintf(__('Sorry, you are not allowed to delete %s.', 'wpem-rest-api'), $this->post_type), array( 'status' => rest_authorization_required_code() ));
+            return new WP_Error( "wpem_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_object_for_response($object, $request);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_object_for_response( $object, $request );
 
         // If we're forcing, then delete permanently.
-        if ($force) {
-            wp_delete_post($object->ID, true);
+        if( $force ) {
+            wp_delete_post( $object->ID, true );
             //$result = 0 === $object->ID;
             $result = 1;
         } else {
             // If we don't support trashing for this type, error out.
-            if (!$supports_trash ) {
+            if( !$supports_trash ) {
                 /* translators: %s: post type */
-                return new WP_Error('wpem_rest_trash_not_supported', sprintf(__('The %s does not support trashing.', 'wpem-rest-api'), $this->post_type), array( 'status' => 501 ));
+                return new WP_Error( 'wpem_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 501 ) );
             } else {
 	            if ($object->post_status === 'trash') {
 		            /* translators: %s: post type */
-		            return new WP_Error('wpem_rest_already_trashed', sprintf(__('The %s has already been deleted.', 'wpem-rest-api'), $this->post_type), array( 'status' => 410 ));
+		            return new WP_Error( 'wpem_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 410 ) );
 	            }
 	            wp_trash_post($object->ID);
 	            $result = 1;
@@ -519,9 +501,9 @@ public function delete_item( $request ) {
         }
 
 
-        if (!$result ) {
+        if( !$result ) {
             /* translators: %s: post type */
-            return new WP_Error('wpem_rest_cannot_delete', sprintf(__('The %s cannot be deleted.', 'wpem-rest-api'), $this->post_type), array( 'status' => 500 ));
+            return new WP_Error( 'wpem_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 500 ) );
         }
 
         /**
@@ -531,10 +513,10 @@ public function delete_item( $request ) {
          * @param WP_REST_Response $response The response data.
          * @param WP_REST_Request  $request  The request sent to the API.
          */
-        do_action("wpem_rest_delete_{$this->post_type}_object", $object, $response, $request);
+        do_action( "wpem_rest_delete_{$this->post_type}_object", $object, $response, $request );
         return array(
 			"code" => "wpem_rest_item_deleted",
-	        "message" => sprintf(__('The %s deleted successfully.', 'wpem-rest-api'), $this->post_type),
+	        "message" => sprintf( __( 'The %s deleted successfully.', 'wpem-rest-api' ), $this->post_type ),
 	        "data" => array( 'status' => 200 )
 	    );
     }
@@ -546,15 +528,14 @@ public function delete_item( $request ) {
      * @param  WP_REST_Request $request Request object.
      * @return array                   Links for the given post.
      */
-    protected function prepare_links( $object, $request )
-    {
+    protected function prepare_links( $object, $request ) {
         $links = array(
-        'self' => array(
-        'href' => rest_url(sprintf('/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID)),
-        ),
-        'collection' => array(
-        'href' => rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)),
-        ),
+            'self' => array(
+                'href' => rest_url( sprintf('/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf('/%s/%s', $this->namespace, $this->rest_base ) ),
+            ),
         );
 
         return $links;
@@ -565,110 +546,109 @@ protected function prepare_links( $object, $request )
      *
      * @return array
      */
-    public function get_collection_params()
-    {
+    public function get_collection_params() {
         $params                       = array();
         $params['context']            = $this->get_context_param();
         $params['context']['default'] = 'view';
 
         $params['page'] = array(
-        'description'        => __('Current page of the collection.', 'wpem-rest-api'),
-        'type'               => 'integer',
-        'default'            => 1,
-        'sanitize_callback'  => 'absint',
-        'validate_callback'  => 'rest_validate_request_arg',
-        'minimum'            => 1,
+            'description'        => __( 'Current page of the collection.', 'wpem-rest-api' ),
+            'type'               => 'integer',
+            'default'            => 1,
+            'sanitize_callback'  => 'absint',
+            'validate_callback'  => 'rest_validate_request_arg',
+            'minimum'            => 1,
         );
         $params['per_page'] = array(
-        'description'        => __('Maximum number of items to be returned in result set.', 'wpem-rest-api'),
-        'type'               => 'integer',
-        'default'            => 10,
-        'minimum'            => 1,
-        'maximum'            => 100,
-        'sanitize_callback'  => 'absint',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Maximum number of items to be returned in result set.', 'wpem-rest-api' ),
+            'type'               => 'integer',
+            'default'            => 10,
+            'minimum'            => 1,
+            'maximum'            => 100,
+            'sanitize_callback'  => 'absint',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['search'] = array(
-        'description'        => __('Limit results to those matching a string.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'sanitize_callback'  => 'sanitize_text_field',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Limit results to those matching a string.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'sanitize_callback'  => 'sanitize_text_field',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['after'] = array(
-        'description'        => __('Limit response to resources published after a given ISO8601 compliant date.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'format'             => 'date-time',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Limit response to resources published after a given ISO8601 compliant date.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'format'             => 'date-time',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['before'] = array(
-        'description'        => __('Limit response to resources published before a given ISO8601 compliant date.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'format'             => 'date-time',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Limit response to resources published before a given ISO8601 compliant date.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'format'             => 'date-time',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['exclude'] = array(
-        'description'       => __('Ensure result set excludes specific IDs.', 'wpem-rest-api'),
-        'type'              => 'array',
-        'items'             => array(
-        'type'          => 'integer',
-        ),
-        'default'           => array(),
-        'sanitize_callback' => 'wp_parse_id_list',
+            'description'       => __( 'Ensure result set excludes specific IDs.', 'wpem-rest-api' ),
+            'type'              => 'array',
+            'items'             => array(
+                'type'          => 'integer',
+             ),
+            'default'           => array(),
+            'sanitize_callback' => 'wp_parse_id_list',
         );
         $params['include'] = array(
-        'description'       => __('Limit result set to specific ids.', 'wpem-rest-api'),
-        'type'              => 'array',
-        'items'             => array(
-        'type'          => 'integer',
-        ),
-        'default'           => array(),
-        'sanitize_callback' => 'wp_parse_id_list',
+            'description'       => __( 'Limit result set to specific ids.', 'wpem-rest-api' ),
+            'type'              => 'array',
+            'items'             => array(
+                'type'          => 'integer',
+            ),
+            'default'           => array(),
+            'sanitize_callback' => 'wp_parse_id_list',
         );
         $params['offset'] = array(
-        'description'        => __('Offset the result set by a specific number of items.', 'wpem-rest-api'),
-        'type'               => 'integer',
-        'sanitize_callback'  => 'absint',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Offset the result set by a specific number of items.', 'wpem-rest-api' ),
+            'type'               => 'integer',
+            'sanitize_callback'  => 'absint',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['order'] = array(
-        'description'        => __('Order sort attribute ascending or descending.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'default'            => 'desc',
-        'enum'               => array( 'asc', 'desc' ),
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Order sort attribute ascending or descending.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'default'            => 'desc',
+            'enum'               => array( 'asc', 'desc' ),
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['orderby'] = array(
-        'description'        => __('Sort collection by object attribute.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'default'            => 'date',
-        'enum'               => array(
-        'date',
-        'id',
-        'include',
-        'title',
-        'slug',
-        ),
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Sort collection by object attribute.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'default'            => 'date',
+            'enum'               => array(
+                'date',
+                'id',
+                'include',
+                'title',
+                'slug',
+            ),
+            'validate_callback'  => 'rest_validate_request_arg',
         );
 
         if ($this->hierarchical ) {
             $params['parent'] = array(
-            'description'       => __('Limit result set to those of particular parent IDs.', 'wpem-rest-api'),
-            'type'              => 'array',
-            'items'             => array(
-            'type'          => 'integer',
-            ),
-            'sanitize_callback' => 'wp_parse_id_list',
-            'default'           => array(),
+                'description'       => __( 'Limit result set to those of particular parent IDs.', 'wpem-rest-api' ),
+                'type'              => 'array',
+                'items'             => array(
+                    'type'          => 'integer',
+                ),
+                'sanitize_callback' => 'wp_parse_id_list',
+                'default'           => array(),
             );
             $params['parent_exclude'] = array(
-            'description'       => __('Limit result set to all items except those of a particular parent ID.', 'wpem-rest-api'),
-            'type'              => 'array',
-            'items'             => array(
-            'type'          => 'integer',
-            ),
-            'sanitize_callback' => 'wp_parse_id_list',
-            'default'           => array(),
+                'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'wpem-rest-api' ),
+                'type'              => 'array',
+                'items'             => array(
+                    'type'          => 'integer',
+                ),
+                'sanitize_callback' => 'wp_parse_id_list',
+                'default'           => array(),
             );
         }
 
@@ -685,6 +665,6 @@ public function get_collection_params()
          * @param array        $query_params JSON Schema-formatted collection parameters.
          * @param WP_Post_Type $post_type    Post type object.
          */
-        return apply_filters("rest_{$this->post_type}_collection_params", $params, $this->post_type);
+        return apply_filters( "rest_{$this->post_type}_collection_params", $params, $this->post_type );
     }
 }
diff --git a/includes/rest-api/wpem-rest-ecosystem-controller.php b/includes/rest-api/wpem-rest-ecosystem-controller.php
index 75640b4..51caf92 100644
--- a/includes/rest-api/wpem-rest-ecosystem-controller.php
+++ b/includes/rest-api/wpem-rest-ecosystem-controller.php
@@ -43,8 +43,7 @@ class WPEM_REST_Ecosystem_Controller extends WPEM_REST_CRUD_Controller {
 	 * Initialize Ecosystem actions.
 	 */
 	public function __construct() {
-		//add_action( "wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
-		add_action('rest_api_init', array( $this, 'register_routes' ), 10);
+		add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
 	}
 	/**
 	 * Register the routes for ecosystem.
@@ -55,17 +54,15 @@ public function register_routes() {
 				'methods'             => WP_REST_Server::READABLE,
 				'callback'            => array( $this, 'get_echosystem_overview' ),
 				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				//'args'                => $this->get_collection_params(),
 			)
-			//'schema' => array( $this, 'get_public_item_schema' ),
 		));
 	}
 
 	public function get_echosystem_overview() {
 		$plugins = get_plugins();
 		$items = array();
-		foreach ($plugins as $filename => $plugin) {
-			if($plugin['AuthorName'] == 'WP Event Manager' && is_plugin_active( $filename )) {
+		foreach( $plugins as $filename => $plugin ) {
+			if( $plugin['AuthorName'] == 'WP Event Manager' && is_plugin_active( $filename ) ) {
 				$licence_key = get_option( $plugin['TextDomain'] . '_licence_key' );
 				$items[$plugin["TextDomain"]] = array(
 					"version" => $plugin["Version"],
@@ -76,5 +73,4 @@ public function get_echosystem_overview() {
 		return $items;
 	}
 }
-
-new WPEM_REST_Ecosystem_Controller();
+new WPEM_REST_Ecosystem_Controller();
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-events-controller.php b/includes/rest-api/wpem-rest-events-controller.php
index 231e2d8..9457c2d 100644
--- a/includes/rest-api/wpem-rest-events-controller.php
+++ b/includes/rest-api/wpem-rest-events-controller.php
@@ -14,8 +14,7 @@
  *
  * @extends WPEM_REST_CRUD_Controller
  */
-class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
-{
+class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller {
 
     /**
      * Endpoint namespace.
@@ -48,34 +47,32 @@ class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
     /**
      * Initialize event actions.
      */
-    public function __construct()
-    {
-        add_action("wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ));
-        add_action('rest_api_init', array( $this, 'register_routes' ), 10);
+    public function __construct() {
+        add_action( "wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
+        add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
     }
 
     /**
      * Register the routes for events.
      */
-    public function register_routes()
-    {
+    public function register_routes() {
         register_rest_route(
             $this->namespace,
             '/' . $this->rest_base,
             array(
-            array(
-            'methods'             => WP_REST_Server::READABLE,
-            'callback'            => array( $this, 'get_items' ),
-            'permission_callback' => array( $this, 'get_items_permissions_check' ),
-            'args'                => $this->get_collection_params(),
-            ),
-            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                array(
                     'methods'             => WP_REST_Server::CREATABLE,
                     'callback'            => array( $this, 'create_item' ),
                     'permission_callback' => array( $this, 'create_item_permissions_check' ),
                     'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::CREATABLE),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -83,13 +80,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/(?P<id>[\d]+)',
             array(
-            'args'   => array(
-            'id' => array(
-            'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-            'type'        => 'integer',
+                'args'   => array(
+                    'id' => array(
+                        'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                        'type'        => 'integer',
                     ),
-            ),
-            array(
+                ),
+                array(
                     'methods'             => WP_REST_Server::READABLE,
                     'callback'            => array( $this, 'get_item' ),
                     'permission_callback' => array( $this, 'get_item_permissions_check' ),
@@ -99,27 +96,27 @@ public function register_routes()
                                 'default' => 'view',
                             )
                         ),
-            ),
-            ),
-            array(
+                    ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::EDITABLE,
                     'callback'            => array( $this, 'update_item' ),
                     'permission_callback' => array( $this, 'update_item_permissions_check' ),
-                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            array(
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::DELETABLE,
                     'callback'            => array( $this, 'delete_item' ),
                     'permission_callback' => array( $this, 'delete_item_permissions_check' ),
                     'args'                => array(
                         'force' => array(
                             'default'     => false,
-                            'description' => __('Whether to bypass trash and force deletion.', 'wpem-rest-api'),
+                            'description' => __( 'Whether to bypass trash and force deletion.', 'wpem-rest-api' ),
                             'type'        => 'boolean',
                         ),
-            ),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                    ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -127,13 +124,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/batch',
             array(
-            array(
-            'methods'             => WP_REST_Server::EDITABLE,
-            'callback'            => array( $this, 'batch_items' ),
-            'permission_callback' => array( $this, 'batch_items_permissions_check' ),
-            'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            'schema' => array( $this, 'get_public_batch_schema' ),
+                array(
+                    'methods'             => WP_REST_Server::EDITABLE,
+                    'callback'            => array( $this, 'batch_items' ),
+                    'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                'schema' => array( $this, 'get_public_batch_schema' ),
             )
         );
 
@@ -141,12 +138,12 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/fields',
             array(
-            array(
-            'methods'             => WP_REST_Server::READABLE,
-            'callback'            => array( $this, 'get_event_fields' ),
-            'permission_callback' => array( $this, 'get_item_permissions_check' ),
-            'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::READABLE),
-            )
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_event_fields' ),
+                    'permission_callback' => array( $this, 'get_item_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::READABLE ),
+                )
             )
         );
     }
@@ -155,16 +152,15 @@ public function register_routes()
      * Get object.
      *
      * @param int $id Object ID.
-     *
      * @since  3.0.0
      * @return Post Data object
      */
     protected function get_object( $id ) {
-		$event = get_post($id);
-		if ($event && $event->post_type === $this->post_type) {
+		$event = get_post( $id );
+		if( $event && $event->post_type === $this->post_type ) {
 			return $event;
 		} else {
-			return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('Invalid ID.', 'wpem-rest-api'), array( 'status' => 404 ));
+			return new WP_Error( "wpem_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'wpem-rest-api' ), array( 'status' => 404 ) );
 		}
     }
 
@@ -177,15 +173,14 @@ protected function get_object( $id ) {
      * @since  3.0.0
      * @return WP_REST_Response
      */
-    public function prepare_object_for_response( $object, $request )
-    {
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->get_event_data($object, $context);
+    public function prepare_object_for_response( $object, $request ) {
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->get_event_data( $object, $context );
 
-        $data     = $this->add_additional_fields_to_object($data, $request);
-        $data     = $this->filter_response_by_context($data, $context);
-        $response = rest_ensure_response($data);
-        $response->add_links($this->prepare_links($object, $request));
+        $data     = $this->add_additional_fields_to_object( $data, $request );
+        $data     = $this->filter_response_by_context( $data, $context );
+        $response = rest_ensure_response( $data );
+        $response->add_links( $this->prepare_links( $object, $request ) );
 
         /**
          * Filter the data for a response.
@@ -197,65 +192,57 @@ public function prepare_object_for_response( $object, $request )
          * @param Post Data          $object   Object data.
          * @param WP_REST_Request  $request  Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request );
     }
 
     /**
      * Prepare objects query.
      *
      * @param WP_REST_Request $request Full details about the request.
-     *
      * @since  1.0.0
      * @return array
      */
-    protected function prepare_objects_query( $request )
-    {
-        $args = parent::prepare_objects_query($request);
+    protected function prepare_objects_query( $request ) {
+        $args = parent::prepare_objects_query( $request );
 
         // Set post_status.
-
-        if (isset($request['status']) && $request['status'] !== 'any') {
+        if( isset( $request['status'] ) && $request['status'] !== 'any' ) {
             $args['post_status'] = $request['status'];
         } else {
-            unset($args['post_status']);
+            unset( $args['post_status'] );
         }
 
-
         // Taxonomy query to filter events by type, category,
         // tag
         $tax_query = array();
 
         // Map between taxonomy name and arg's key.
         $taxonomies = array(
-        'event_listing_category'            => 'category',
-        'event_listing_type'            => 'type'
+            'event_listing_category'            => 'category',
+            'event_listing_type'            => 'type'
         );
 
         // Set tax_query for each passed arg.
-        foreach ( $taxonomies as $taxonomy => $key ) {
-            if (! empty($request[ $key ]) ) {
+        foreach( $taxonomies as $taxonomy => $key ) {
+            if( !empty($request[ $key ] ) ) {
                 $tax_query[] = array(
-                'taxonomy' => $taxonomy,
-                'field'    => 'term_id',
-                'terms'    => $request[ $key ],
+                    'taxonomy' => $taxonomy,
+                    'field'    => 'term_id',
+                    'terms'    => $request[ $key ],
                 );
             }
         }
-
-
         // Filter by term.
-        if (! empty($tax_query) ) {
+        if( !empty( $tax_query ) ) {
             $args['tax_query'] = $tax_query; // WPCS: slow query ok.
         }
 
         $args['author'] = get_current_user_id();
-
         $args['post_type'] = $this->post_type;
 
         return $args;
     }
 
-
     /**
      * Get taxonomy terms.
      *
@@ -264,18 +251,15 @@ protected function prepare_objects_query( $request )
      *
      * @return array
      */
-    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' )
-    {
+    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' ) {
         $terms = array();
-
-        foreach ( get_the_terms($event->ID,  $taxonomy) as $term ) {
+        foreach ( get_the_terms( $event->ID,  $taxonomy) as $term ) {
             $terms[] = array(
-            'id'   => $term->term_id,
-            'name' => $term->name,
-            'slug' => $term->slug,
+                'id'   => $term->term_id,
+                'name' => $term->name,
+                'slug' => $term->slug,
             );
         }
-
         return $terms;
     }
 
@@ -286,33 +270,28 @@ protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_catego
      *
      * @return array
      */
-    protected function get_images( $event )
-    {
+    protected function get_images( $event ) {
         $images         = array();
         $attachment_ids = array();
 
         //get event banner here
-
-
         // Set a placeholder image if the event has no images set.
         if (empty($images) ) {
             $images[] = array(
-            'id'                => 0,
-            'date_created'      => wpem_rest_api_prepare_date_response(current_time('mysql'), false), // Default to now.
-            'date_created_gmt'  => wpem_rest_api_prepare_date_response(current_time('timestamp', true)), // Default to now.
-            'date_modified'     => wpem_rest_api_prepare_date_response(current_time('mysql'), false),
-            'date_modified_gmt' => wpem_rest_api_prepare_date_response(current_time('timestamp', true)),
-            'src'               => '',
-            'name'              => __('Placeholder', 'wpem-rest-api'),
-            'alt'               => __('Placeholder', 'wpem-rest-api'),
-            'position'          => 0,
+                'id'                => 0,
+                'date_created'      => wpem_rest_api_prepare_date_response( current_time( 'mysql' ), false ), // Default to now.
+                'date_created_gmt'  => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ), // Default to now.
+                'date_modified'     => wpem_rest_api_prepare_date_response( current_time( 'mysql' ), false ),
+                'date_modified_gmt' => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ),
+                'src'               => '',
+                'name'              => __( 'Placeholder', 'wpem-rest-api' ),
+                'alt'               => __( 'Placeholder', 'wpem-rest-api' ),
+                'position'          => 0,
             );
         }
-
         return $images;
     }
 
-
     /**
      * Get event data.
      *
@@ -323,37 +302,31 @@ protected function get_images( $event )
      *
      * @return array
      */
-    protected function get_event_data( $event, $context = 'view' )
-    {
+    protected function get_event_data( $event, $context = 'view' ) {
 
 
-        $meta_data    = get_post_meta($event->ID);
-        foreach ($meta_data as $key => $value) {
-            $meta_data[$key]= get_post_meta($event->ID, $key, true);
+        $meta_data    = get_post_meta( $event->ID );
+        foreach( $meta_data as $key => $value ) {
+            $meta_data[$key]= get_post_meta( $event->ID, $key, true );
         }
-
-
         $data = array(
-        'id'                    => $event->ID,
-        'name'                  => $event->post_title,
-        'slug'                  => $event->post_name,
-        'permalink'             => get_permalink($event->ID),
-        'date_created'          => get_the_date('', $event),
-        'date_modified'         => get_the_modified_date('', $event),
-        'status'                => $event->post_status,
-        'featured'              => $event->_featured,
-
-        'description'           => 'view' === $context ? wpautop(do_shortcode(get_the_content('', false, $event))) : get_the_content('', false, $event),
-
-        'event_categories'            => taxonomy_exists('event_listing_category') ? get_the_terms($event->ID, 'event_listing_category') : ''   ,
-        'event_types'            => taxonomy_exists('event_listing_type') ? get_the_terms($event->ID, 'event_listing_type') : '',
-        'event_tags'                  => taxonomy_exists('event_listing_tag') ? get_the_terms($event->ID, 'event_listing_tag') : '',
-        'images'                => get_event_banner($event),
-        //'menu_order'            => '',
-        'meta_data'             => $meta_data,
+            'id'                    => $event->ID,
+            'name'                  => $event->post_title,
+            'slug'                  => $event->post_name,
+            'permalink'             => get_permalink( $event->ID ),
+            'date_created'          => get_the_date( '', $event ),
+            'date_modified'         => get_the_modified_date( '', $event ),
+            'status'                => $event->post_status,
+            'featured'              => $event->_featured,
+            'description'           => 'view' === $context ? wpautop( do_shortcode( get_the_content( '', false, $event ) ) ) : get_the_content( '', false, $event ),
+            'event_categories'      => taxonomy_exists( 'event_listing_category' ) ? get_the_terms( $event->ID, 'event_listing_category' ) : ''   ,
+            'event_types'           => taxonomy_exists( 'event_listing_type' ) ? get_the_terms( $event->ID, 'event_listing_type' ) : '',
+            'event_tags'            => taxonomy_exists( 'event_listing_tag' ) ? get_the_terms( $event->ID, 'event_listing_tag' ) : '',
+            'images'                => get_event_banner( $event ),
+            'meta_data'             => $meta_data,
         );
 
-        return apply_filters("wpem_rest_get_{$this->post_type}_data", $data, $event, $context);
+        return apply_filters( "wpem_rest_get_{$this->post_type}_data", $data, $event, $context );
     }
 
     /**
@@ -363,19 +336,18 @@ protected function get_event_data( $event, $context = 'view' )
      * @param  WP_REST_Request $request Request object.
      * @return WP_REST_Response
      */
-    public function prepare_item_for_response( $post, $request )
-    {
-        $event = get_post($post);
-        $data    = $this->get_event_data($event);
+    public function prepare_item_for_response( $post, $request ) {
+        $event = get_post( $post );
+        $data  = $this->get_event_data( $event );
 
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->add_additional_fields_to_object($data, $request);
-        $data    = $this->filter_response_by_context($data, $context);
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
 
         // Wrap the data in a response object.
-        $response = rest_ensure_response($data);
+        $response = rest_ensure_response( $data );
 
-        $response->add_links($this->prepare_links($event, $request));
+        $response->add_links( $this->prepare_links( $event, $request ) );
 
         /**
          * Filter the data for a response.
@@ -387,7 +359,7 @@ public function prepare_item_for_response( $post, $request )
          * @param WP_Post            $post       Post object.
          * @param WP_REST_Request    $request    Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}", $response, $post, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}", $response, $post, $request );
     }
 
     /**
@@ -398,23 +370,21 @@ public function prepare_item_for_response( $post, $request )
      *
      * @return array                   Links for the given post.
      */
-    protected function prepare_links( $object, $request )
-    {
+    protected function prepare_links( $object, $request ) {
         $links = array(
-        'self'       => array(
-       'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
-        ),
-        'collection' => array(
-       'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
-        ),
+            'self' => array(
+                'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
+            ),
         );
 
         if ($object->post_parent  ) {
             $links['up'] = array(
-          'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent  ) ),  // @codingStandardsIgnoreLine.
+                'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent ) ),  // @codingStandardsIgnoreLine.
             );
         }
-
         return $links;
     }
 
@@ -427,40 +397,38 @@ protected function prepare_links( $object, $request )
      * @return WP_Error | Post
      */
     protected function prepare_object_for_database( $request, $creating = false ) {
-        $id = isset($request['id']) ? absint($request['id']) : 0;
+        $id = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
 
-        if (isset($request['id']) ) {
+        if( isset($request['id'] ) ) {
 
             $_POST = $request;
-
-            $GLOBALS['event_manager']->forms->get_form('edit-event', array());
-            $form_edit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Edit_Event', 'instance' ));
-            $event_fields =    $form_edit_event_instance->merge_with_custom_fields('frontend');
+            $GLOBALS['event_manager']->forms->get_form( 'edit-event', array() );
+            $form_edit_event_instance = call_user_func( array( 'WP_Event_Manager_Form_Edit_Event', 'instance' ) );
+            $event_fields = $form_edit_event_instance->merge_with_custom_fields( 'frontend' );
 
             $values = $form_edit_event_instance->get_posted_fields();
 
             // Update the event
-            $form_edit_event_instance->save_event($request['event_title'], $request['event_description'], '', $values, false);
-            $form_edit_event_instance->update_event_data($values);
+            $form_edit_event_instance->save_event( $request['event_title'], $request['event_description'], '', $values, false );
+            $form_edit_event_instance->update_event_data( $values );
 
             //final response after update
-            $event = get_post($id);
+            $event = get_post( $id );
         } else {
-            if(!empty($request['event_title']) && isset($request['event_id'])  && $request['event_id'] == 0 ) {
+            if( !empty( $request['event_title'] ) && isset( $request['event_id'] )  && $request['event_id'] == 0 ) {
                 $_POST = $request;
 
                 //we are inserting new event means if there is any already created event cookies we need to remvoe it
-                if(isset($_COOKIE['wp-event-manager-submitting-event-id']) ) {
-                       unset($_COOKIE['wp-event-manager-submitting-event-id']);
+                if( isset( $_COOKIE['wp-event-manager-submitting-event-id'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-id'] );
                 }
-                if(isset($_COOKIE['wp-event-manager-submitting-event-key']) ) {
-                        unset($_COOKIE['wp-event-manager-submitting-event-key']);
+                if( isset( $_COOKIE['wp-event-manager-submitting-event-key'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-key'] );
                 }
 
-
-                $GLOBALS['event_manager']->forms->get_form('submit-event', array());
-                $form_submit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ));
-                $event_fields =    $form_submit_event_instance->merge_with_custom_fields('frontend');
+                $GLOBALS['event_manager']->forms->get_form( 'submit-event', array() );
+                $form_submit_event_instance = call_user_func( array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ) );
+                $event_fields =    $form_submit_event_instance->merge_with_custom_fields( 'frontend' );
 
                 //submit current event with $_POST values
                 $form_submit_event_instance ->submit_handler();
@@ -470,20 +438,18 @@ protected function prepare_object_for_database( $request, $creating = false ) {
                 $form_submit_event_instance->preview_handler();
 
                 //we don't need done status it will be managed by response of the current request
-                if(!$form_submit_event_instance->get_event_id() ) {
+                if( !$form_submit_event_instance->get_event_id() ) {
 
                     $validation_errors =  $form_submit_event_instance->get_errors();
-                    foreach ( $validation_errors as $error ) {
-                        echo  esc_html__($error);
+                    foreach( $validation_errors as $error ) {
+                        echo esc_html__( $error );
                     }
                     return;
                 }
-                $event = get_post($form_submit_event_instance->get_event_id());
-            }
-            else{
+                $event = get_post( $form_submit_event_instance->get_event_id() );
+            } else {
                 return;
             }
-
         }
 
         /**
@@ -496,7 +462,7 @@ protected function prepare_object_for_database( $request, $creating = false ) {
          * @param WP_REST_Request $request  Request object.
          * @param bool            $creating If is creating a new object.
          */
-        return apply_filters("wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating);
+        return apply_filters( "wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating );
     }
 
     /**
@@ -504,79 +470,70 @@ protected function prepare_object_for_database( $request, $creating = false ) {
      *
      * @param $event  Event instance.
      * @param array $images Images data.
-     *
      * @throws WC_REST_Exception REST API exceptions.
      * @return $event object
      */
-    protected function set_event_images( $event, $images )
-    {
-        $images = is_array($images) ? array_filter($images) : array();
+    protected function set_event_images( $event, $images ) {
+        $images = is_array( $images ) ? array_filter( $images ) : array();
 
-        if (! empty($images) ) {
+        if( !empty( $images ) ) {
             $gallery_positions = array();
 
-            foreach ( $images as $index => $image ) {
-                $attachment_id = isset($image['id']) ? absint($image['id']) : 0;
+            foreach( $images as $index => $image ) {
+                $attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
-                if (0 === $attachment_id && isset($image['src']) ) {
-                    $upload = wpem_rest_upload_image_from_url(esc_url_raw($image['src']));
+                if( 0 === $attachment_id && isset( $image['src'] ) ) {
+                    $upload = wpem_rest_upload_image_from_url( esc_url_raw( $image['src'] ) );
 
-                    if (is_wp_error($upload) ) {
-                        if (! apply_filters('wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images) ) {
-                            throw new Exception('wpem_event_image_upload_error', $upload->get_error_message(), 400);
+                    if( is_wp_error( $upload ) ) {
+                        if( !apply_filters( 'wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images ) ) {
+                            throw new Exception( 'wpem_event_image_upload_error', $upload->get_error_message(), 400 );
                         } else {
                             continue;
                         }
                     }
-
-                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment($upload, $event->ID);
+                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment( $upload, $event->ID );
                 }
 
-                if (! wp_attachment_is_image($attachment_id) ) {
+                if( !wp_attachment_is_image( $attachment_id ) ) {
                     /* translators: %s: attachment id */
-                    throw new Exception('wpem_event_invalid_image_id', sprintf(__('#%s is an invalid image ID.', 'wpem-rest-api'), $attachment_id), 400);
+                    throw new Exception( 'wpem_event_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'wpem-rest-api' ), $attachment_id ), 400 );
                 }
 
-                $gallery_positions[ $attachment_id ] = absint(isset($image['position']) ? $image['position'] : $index);
-
+                $gallery_positions[ $attachment_id ] = absint( isset( $image['position'] ) ? $image['position'] : $index );
                 // Set the image alt if present.
-                if (! empty($image['alt']) ) {
-                    update_post_meta($attachment_id, '_wp_attachment_image_alt', wc_clean($image['alt']));
+                if( !empty( $image['alt'] ) ) {
+                    update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
                 }
 
                 // Set the image name if present.
-                if (! empty($image['name']) ) {
+                if( !empty( $image['name'] ) ) {
                     wp_update_post(
                         array(
-                        'ID'         => $attachment_id,
-                        'post_title' => $image['name'],
+                            'ID'         => $attachment_id,
+                            'post_title' => $image['name'],
                         )
                     );
                 }
 
                 // Set the image source if present, for future reference.
-                if (! empty($image['src']) ) {
-                    update_post_meta($attachment_id, '_wpem_attachment_source', esc_url_raw($image['src']));
+                if( !empty( $image['src'] ) ) {
+                    update_post_meta( $attachment_id, '_wpem_attachment_source', esc_url_raw( $image['src'] ) );
                 }
             }
-
             // Sort images and get IDs in correct order.
-            asort($gallery_positions);
-
+            asort( $gallery_positions );
             // Get gallery in correct order.
-            $gallery = array_keys($gallery_positions);
-
+            $gallery = array_keys( $gallery_positions );
             // Featured image is in position 0.
-            $image_id = array_shift($gallery);
-
+            $image_id = array_shift( $gallery );
             // Set images.
-            $event->set_image_id($image_id);
-            $event->set_gallery_image_ids($gallery);
+            $event->set_image_id( $image_id );
+            $event->set_gallery_image_ids( $gallery );
         } else {
-            $event->set_image_id('');
-            $event->set_gallery_image_ids(array());
+            $event->set_image_id( '' );
+            $event->set_gallery_image_ids( array() );
         }
-
         return $event;
     }
 
@@ -587,267 +544,255 @@ protected function set_event_images( $event, $images )
      * @param Event  $event    instance.
      * @param array  $terms    Terms data.
      * @param string $taxonomy Taxonomy name.
-     *
      * @return Event object
      */
-    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' )
-    {
-        $term_ids = wp_list_pluck($terms, 'id');
-
-        if ('event_listing_category' === $taxonomy ) {
-            $event->set_category_ids($term_ids);
-        } elseif ('event_listing_type' === $taxonomy ) {
-            $event->set_type_ids($term_ids);
-        } elseif ('tag' === $taxonomy ) {
-            $event->set_tag_ids($term_ids);
+    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' ) {
+        $term_ids = wp_list_pluck( $terms, 'id' );
+
+        if( 'event_listing_category' === $taxonomy ) {
+            $event->set_category_ids( $term_ids );
+        } elseif( 'event_listing_type' === $taxonomy ) {
+            $event->set_type_ids( $term_ids );
+        } elseif( 'tag' === $taxonomy ) {
+            $event->set_tag_ids( $term_ids );
         }
-
         return $event;
     }
 
-
-
     /**
      * Clear caches here so in sync with any new variations/children.
      *
      * @param WC_Data $object Object data.
      */
-    public function clear_transients( $object )
-    {
+    public function clear_transients( $object ) {
         //call wpem clear transient here
     }
 
-
     /**
      * Get the Event's schema, conforming to JSON Schema.
      *
      * @return array
      */
-    public function get_item_schema()
-    {
-        $weight_unit    = get_option('wpem_weight_unit');
-        $dimension_unit = get_option('wpem_dimension_unit');
-        $schema         = array(
-        '$schema'    => 'http://json-schema.org/draft-04/schema#',
-        'title'      => $this->post_type,
-        'type'       => 'object',
-        'properties' => array(
-        'id'                    => array(
-        'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-        'type'        => 'integer',
-        'context'     => array( 'view', 'edit' ),
-        'readonly'    => true,
-        ),
-        'name'                  => array(
-                    'description' => __('Event name.', 'wpem-rest-api'),
+    public function get_item_schema() {
+        $weight_unit    = get_option( 'wpem_weight_unit' );
+        $dimension_unit = get_option( 'wpem_dimension_unit' );
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+            'properties' => array(
+                'id' => array(
+                    'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'name' => array(
+                    'description' => __( 'Event name.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'slug'                  => array(
-                    'description' => __('event slug.', 'wpem-rest-api'),
+                ),
+                'slug' => array(
+                    'description' => __( 'event slug.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'permalink'             => array(
-                    'description' => __('event URL.', 'wpem-rest-api'),
+                ),
+                'permalink' => array(
+                    'description' => __( 'event URL.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'format'      => 'uri',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created'          => array(
-                    'description' => __("The date the event was created, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_created' => array(
+                    'description' => __( "The date the event was created, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created_gmt'      => array(
-                    'description' => __('The date the event was created, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_created_gmt'      => array(
+                    'description' => __( 'The date the event was created, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified'         => array(
-                    'description' => __("The date the event was last modified, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_modified'         => array(
+                    'description' => __( "The date the event was last modified, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified_gmt'     => array(
-                    'description' => __('The date the event was last modified, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_modified_gmt' => array(
+                    'description' => __( 'The date the event was last modified, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-
-        'status'                => array(
-                    'description' => __('Event status (post status).', 'wpem-rest-api'),
+                ),
+                'status' => array(
+                    'description' => __( 'Event status (post status).', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'default'     => 'publish',
-                    'enum'        => array_merge(array_keys(get_post_statuses()), array( 'future' ,'expired')),
+                    'enum'        => array_merge( array_keys( get_post_statuses() ), array( 'future' ,'expired' ) ),
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'featured'              => array(
-                    'description' => __('Featured event.', 'wpem-rest-api'),
+                ),
+                'featured' => array(
+                    'description' => __( 'Featured event.', 'wpem-rest-api' ),
                     'type'        => 'boolean',
                     'default'     => false,
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'description'           => array(
-                    'description' => __('Event description.', 'wpem-rest-api'),
+                ),
+                'description' => array(
+                    'description' => __( 'Event description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'short_description'     => array(
-                    'description' => __('Event short description.', 'wpem-rest-api'),
+                ),
+                'short_description' => array(
+                    'description' => __( 'Event short description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-
-        'categories'            => array(
-                    'description' => __('List of categories.', 'wpem-rest-api'),
+                ),
+                'categories' => array(
+                    'description' => __( 'List of categories.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
-                        'type'       => 'object',
-                        'properties' => array(
-                            'id'   => array(
-                                'description' => __('Category ID.', 'wpem-rest-api'),
+                        'type'        => 'object',
+                        'properties'  => array(
+                            'id' => array(
+                                'description' => __( 'Category ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Category name.', 'wpem-rest-api'),
+                                'description' => __( 'Category name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Category slug.', 'wpem-rest-api'),
+                                'description' => __( 'Category slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'tags'                  => array(
-                    'description' => __('List of tags.', 'wpem-rest-api'),
+                    ),
+                ),
+                'tags' => array(
+                    'description' => __( 'List of tags.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'   => array(
-                                'description' => __('Tag ID.', 'wpem-rest-api'),
+                                'description' => __( 'Tag ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Tag name.', 'wpem-rest-api'),
+                                'description' => __( 'Tag name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Tag slug.', 'wpem-rest-api'),
+                                'description' => __( 'Tag slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'images'                => array(
-                    'description' => __('List of images.', 'wpem-rest-api'),
+                     ),
+                ),
+                'images' => array(
+                    'description' => __( 'List of images.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
-                            'id'                => array(
-                                'description' => __('Image ID.', 'wpem-rest-api'),
+                            'id' => array(
+                                'description' => __( 'Image ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'date_created'      => array(
-                                'description' => __("The date the image was created, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was created, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_created_gmt'  => array(
-                                'description' => __('The date the image was created, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was created, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified'     => array(
-                                'description' => __("The date the image was last modified, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was last modified, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified_gmt' => array(
-                                'description' => __('The date the image was last modified, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was last modified, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'src'               => array(
-                                'description' => __('Image URL.', 'wpem-rest-api'),
+                                'description' => __( 'Image URL.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'format'      => 'uri',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name'              => array(
-                                'description' => __('Image name.', 'wpem-rest-api'),
+                                'description' => __( 'Image name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'alt'               => array(
-                                'description' => __('Image alternative text.', 'wpem-rest-api'),
+                                'description' => __( 'Image alternative text.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'position'          => array(
-                                'description' => __('Image position. 0 means that the image is featured.', 'wpem-rest-api'),
+                                'description' => __( 'Image position. 0 means that the image is featured.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-
-        'meta_data'             => array(
-                    'description' => __('Meta data.', 'wpem-rest-api'),
+                    ),
+                ),
+                'meta_data' => array(
+                    'description' => __( 'Meta data.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'    => array(
-                                'description' => __('Meta ID.', 'wpem-rest-api'),
+                                'description' => __( 'Meta ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'key'   => array(
-                                'description' => __('Meta key.', 'wpem-rest-api'),
+                                'description' => __( 'Meta key.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'value' => array(
-                                'description' => __('Meta value.', 'wpem-rest-api'),
+                                'description' => __( 'Meta value.', 'wpem-rest-api' ),
                                 'type'        => 'mixed',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-        ),
+                    ),
+                ),
+            ),
         );
-
         return $this->add_additional_fields_schema($schema);
     }
 
@@ -856,46 +801,43 @@ public function get_item_schema()
      *
      * @return array
      */
-    public function get_collection_params()
-    {
+    public function get_collection_params() {
         $params = parent::get_collection_params();
 
-        $params['orderby']['enum'] = array_merge($params['orderby']['enum'], array( 'menu_order' ));
+        $params['orderby']['enum'] = array_merge( $params['orderby']['enum'], array( 'menu_order' ) );
 
-        $params['slug']           = array(
-        'description'       => __('Limit result set to events with a specific slug.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['slug'] = array(
+            'description'       => __( 'Limit result set to events with a specific slug.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['status']         = array(
-        'default'           => 'any',
-        'description'       => __('Limit result set to events assigned a specific status.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'enum'              => array_merge(array( 'any', 'future','expired' ), array_keys(get_post_statuses())),
-        'sanitize_callback' => 'sanitize_key',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['status'] = array(
+            'default'           => 'any',
+            'description'       => __( 'Limit result set to events assigned a specific status.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'enum'              => array_merge( array( 'any', 'future','expired' ), array_keys( get_post_statuses() ) ),
+            'sanitize_callback' => 'sanitize_key',
+            'validate_callback' => 'rest_validate_request_arg',
         );
 
-        $params['featured']       = array(
-        'description'       => __('Limit result set to featured events.', 'wpem-rest-api'),
-        'type'              => 'boolean',
-        'sanitize_callback' => 'wc_string_to_bool',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['featured'] = array(
+            'description'       => __( 'Limit result set to featured events.', 'wpem-rest-api' ),
+            'type'              => 'boolean',
+            'sanitize_callback' => 'wc_string_to_bool',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['category']       = array(
-        'description'       => __('Limit result set to events assigned a specific category ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['category'] = array(
+            'description'       => __( 'Limit result set to events assigned a specific category ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['tag']            = array(
-        'description'       => __('Limit result set to events assigned a specific tag ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['tag'] = array(
+            'description'       => __( 'Limit result set to events assigned a specific tag ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-
-
         return $params;
     }
 
@@ -904,102 +846,83 @@ public function get_collection_params()
      *
      * @return array
      */
-    public function check_event_permissions($request)
-    {
-
-    }
+    public function check_event_permissions($request) { }
 
     /**
      * Get the query params and return event fields
      *
      * @return array
      */
-    public function get_event_fields($request)
-    {
+    public function get_event_fields($request) {
 
-        if(!class_exists('WP_Event_Manager_Form_Submit_Event') ) {
+        if( !class_exists( 'WP_Event_Manager_Form_Submit_Event' ) ) {
             include_once EVENT_MANAGER_PLUGIN_DIR . '/forms/wp-event-manager-form-abstract.php';
             include_once EVENT_MANAGER_PLUGIN_DIR . '/forms/wp-event-manager-form-submit-event.php';
         }
-        $form_submit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ));
-        $fields = $form_submit_event_instance->merge_with_custom_fields('frontend');
+        $form_submit_event_instance = call_user_func( array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ) );
+        $fields = $form_submit_event_instance->merge_with_custom_fields( 'frontend' );
 
         $event_fields = [];
 
-        foreach ($fields as $group_key => $group_fields)
-        {
-            foreach ($group_fields as $key => $field)
-            {
-                if($field['type'] === 'term-select' || $field['type'] === 'term-multiselect' ) {
-                    $field['options'] = $this->get_event_texonomy($field['taxonomy']);
+        foreach ($fields as $group_key => $group_fields) {
+            foreach ($group_fields as $key => $field) {
+                if( $field['type'] === 'term-select' || $field['type'] === 'term-multiselect' ) {
+                    $field['options'] = $this->get_event_texonomy( $field['taxonomy'] );
                 }
-
                 $event_fields[$group_key][$key] = $field;
             }
         }
-
         return $event_fields;
     }
 
-
-
     /**
      * Get the query params and return event fields
      *
      * @return array
      */
-    public function get_event_texonomy($texonomy = '')
-    {
+    public function get_event_texonomy( $texonomy = '' ) {
         $terms = get_terms(
             array(
-            'taxonomy' => $texonomy,
-            'hide_empty' => false,
+                'taxonomy' => $texonomy,
+                'hide_empty' => false,
             )
         );
 
         $data = [];
 
-        if(!empty($terms)) {
-            foreach ($terms as $term) {
+        if( !empty( $terms ) ) {
+            foreach( $terms as $term ) {
                 $data[$term->term_id] = $term->name;
             }
         }
-
         return $data;
     }
-
-
-    public function get_addon_item_info()
-    {
+    public function get_addon_item_info(){
 
         $plugins = get_plugins();
-        foreach ($plugins as $filename => $plugin)
-        {
-            if($plugin['AuthorName'] == 'WP Event Manager' && is_plugin_active($filename) && !in_array($plugin['TextDomain'], ["wp-event-manager", "wp-user-profile-avatar"]) ) {
-                $licence_key = get_option($plugin['TextDomain'] . '_licence_key');
-                $email = get_option($plugin['TextDomain'] . '_email');
-                if(empty($email)) {
-                      $email = get_option('admin_email');
+        foreach( $plugins as $filename => $plugin ) {
+            if( $plugin['AuthorName'] == 'WP Event Manager' && is_plugin_active( $filename ) && !in_array( $plugin['TextDomain'], ["wp-event-manager", "wp-user-profile-avatar"] ) ) {
+                $licence_key = get_option( $plugin['TextDomain'] . '_licence_key' );
+                $email = get_option( $plugin['TextDomain'] . '_email' );
+                if( empty( $email ) ) {
+                      $email = get_option(' admin_email' );
                 }
 
                 $disabled = '';
-                if(!empty($licence_key)) {
+                if( !empty( $licence_key ) ) {
                     $disabled = 'disabled';
                 }
 
                 $data[$plugin['TextDomain']]= array(
-                                    'name'=> $plugin['Name'],
-                                    'title'=> $plugin['Title'],
-                                    'author'=> $plugin['Author'],
-                                    'version'=> $plugin['Version'],
+                    'name'=> $plugin['Name'],
+                    'title'=> $plugin['Title'],
+                    'author'=> $plugin['Author'],
+                    'version'=> $plugin['Version'],
                 );
             }
         }
-
-
         return $data;
     }
 }
 
-
-new WPEM_REST_Events_Controller();
+new WPEM_REST_Events_Controller();
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-organizers-controller.php b/includes/rest-api/wpem-rest-organizers-controller.php
index 510ddb1..10d286e 100644
--- a/includes/rest-api/wpem-rest-organizers-controller.php
+++ b/includes/rest-api/wpem-rest-organizers-controller.php
@@ -7,40 +7,35 @@
  * @since 1.0.0
  */
 
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
 /**
  * REST API Events controller class.
  *
  * @extends WPEM_REST_CRUD_Controller
  */
-class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
-{
+class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller {
 
     /**
      * Endpoint namespace.
-     *
      * @var string
      */
     protected $namespace = 'wpem';
 
     /**
      * Route base.
-     *
      * @var string
      */
     protected $rest_base = 'organizers';
 
     /**
      * Post type.
-     *
      * @var string
      */
     protected $post_type = 'event_organizer';
 
     /**
      * If object is hierarchical.
-     *
      * @var bool
      */
     protected $hierarchical = true;
@@ -48,34 +43,32 @@ class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
     /**
      * Initialize event actions.
      */
-    public function __construct()
-    {
-        add_action("wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ));
-        add_action('rest_api_init', array( $this, 'register_routes' ), 10);
+    public function __construct() {
+        add_action( "wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
+        add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
     }
 
     /**
      * Register the routes for events.
      */
-    public function register_routes()
-    {
+    public function register_routes() {
         register_rest_route(
             $this->namespace,
             '/' . $this->rest_base,
             array(
-            array(
-            'methods'             => WP_REST_Server::READABLE,
-            'callback'            => array( $this, 'get_items' ),
-            'permission_callback' => array( $this, 'get_items_permissions_check' ),
-            'args'                => $this->get_collection_params(),
-            ),
-            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                array(
                     'methods'             => WP_REST_Server::CREATABLE,
                     'callback'            => array( $this, 'create_item' ),
                     'permission_callback' => array( $this, 'create_item_permissions_check' ),
-                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::CREATABLE),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -83,13 +76,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/(?P<id>[\d]+)',
             array(
-            'args'   => array(
-            'id' => array(
-            'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-            'type'        => 'integer',
+                'args'   => array(
+                    'id' => array(
+                        'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                        'type'        => 'integer',
                     ),
-            ),
-            array(
+                ),
+                array(
                     'methods'             => WP_REST_Server::READABLE,
                     'callback'            => array( $this, 'get_item' ),
                     'permission_callback' => array( $this, 'get_item_permissions_check' ),
@@ -99,27 +92,27 @@ public function register_routes()
                                 'default' => 'view',
                             )
                         ),
-            ),
-            ),
-            array(
+                    ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::EDITABLE,
                     'callback'            => array( $this, 'update_item' ),
                     'permission_callback' => array( $this, 'update_item_permissions_check' ),
-                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            array(
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::DELETABLE,
                     'callback'            => array( $this, 'delete_item' ),
                     'permission_callback' => array( $this, 'delete_item_permissions_check' ),
                     'args'                => array(
                         'force' => array(
                             'default'     => false,
-                            'description' => __('Whether to bypass trash and force deletion.', 'wpem-rest-api'),
+                            'description' => __( 'Whether to bypass trash and force deletion.', 'wpem-rest-api' ),
                             'type'        => 'boolean',
                         ),
-            ),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                    ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -127,13 +120,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/batch',
             array(
-            array(
-            'methods'             => WP_REST_Server::EDITABLE,
-            'callback'            => array( $this, 'batch_items' ),
-            'permission_callback' => array( $this, 'batch_items_permissions_check' ),
-            'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            'schema' => array( $this, 'get_public_batch_schema' ),
+                array(
+                    'methods'             => WP_REST_Server::EDITABLE,
+                    'callback'            => array( $this, 'batch_items' ),
+                    'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                'schema' => array( $this, 'get_public_batch_schema' ),
             )
         );
     }
@@ -146,9 +139,8 @@ public function register_routes()
      * @since  3.0.0
      * @return Post Data object
      */
-    protected function get_object( $id )
-    {
-        return get_post($id);
+    protected function get_object( $id ) {
+        return get_post( $id );
     }
 
     /**
@@ -160,15 +152,14 @@ protected function get_object( $id )
      * @since  3.0.0
      * @return WP_REST_Response
      */
-    public function prepare_object_for_response( $object, $request )
-    {
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->get_event_data($object, $context);
+    public function prepare_object_for_response( $object, $request ) {
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->get_event_data( $object, $context );
 
-        $data     = $this->add_additional_fields_to_object($data, $request);
-        $data     = $this->filter_response_by_context($data, $context);
-        $response = rest_ensure_response($data);
-        $response->add_links($this->prepare_links($object, $request));
+        $data     = $this->add_additional_fields_to_object( $data, $request );
+        $data     = $this->filter_response_by_context( $data, $context );
+        $response = rest_ensure_response( $data );
+        $response->add_links( $this->prepare_links( $object, $request ) );
 
         /**
          * Filter the data for a response.
@@ -180,7 +171,7 @@ public function prepare_object_for_response( $object, $request )
          * @param Post Data          $object   Object data.
          * @param WP_REST_Request  $request  Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request );
     }
 
     /**
@@ -191,66 +182,53 @@ public function prepare_object_for_response( $object, $request )
      * @since  1.0.0
      * @return array
      */
-    protected function prepare_objects_query( $request )
-    {
-        $args = parent::prepare_objects_query($request);
+    protected function prepare_objects_query( $request ) {
+        $args = parent::prepare_objects_query ($request );
 
         // Set post_status.
         $args['post_status'] = $request['status'];
-
         // Taxonomy query to filter events by type, category,
-        // tag
         $tax_query = array();
-
         // Map between taxonomy name and arg's key.
         $taxonomies = array(
-        'event_listing_category'            => 'category',
-        'event_listing_type'            => 'type'
+            'event_listing_category' => 'category',
+            'event_listing_type'     => 'type'
         );
-
         // Set tax_query for each passed arg.
-        foreach ( $taxonomies as $taxonomy => $key ) {
-            if (! empty($request[ $key ]) ) {
+        foreach( $taxonomies as $taxonomy => $key ) {
+            if( !empty( $request[ $key ] ) ) {
                 $tax_query[] = array(
-                'taxonomy' => $taxonomy,
-                'field'    => 'term_id',
-                'terms'    => $request[ $key ],
+                    'taxonomy' => $taxonomy,
+                    'field'    => 'term_id',
+                    'terms'    => $request[ $key ],
                 );
             }
         }
-
-
         // Filter by term.
-        if (! empty($tax_query) ) {
+        if( !empty( $tax_query ) ) {
             $args['tax_query'] = $tax_query; // WPCS: slow query ok.
         }
-
         $args['post_type'] = $this->post_type;
-
         return $args;
     }
 
-
     /**
      * Get taxonomy terms.
      *
      * @param Post   $event    as post instance.
      * @param string $taxonomy Taxonomy slug.
-     *
      * @return array
      */
-    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' )
-    {
+    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' ) {
         $terms = array();
 
-        foreach ( get_the_terms($event->ID,  $taxonomy) as $term ) {
+        foreach ( get_the_terms( $event->ID,  $taxonomy ) as $term ) {
             $terms[] = array(
-            'id'   => $term->term_id,
-            'name' => $term->name,
-            'slug' => $term->slug,
+                'id'   => $term->term_id,
+                'name' => $term->name,
+                'slug' => $term->slug,
             );
         }
-
         return $terms;
     }
 
@@ -258,66 +236,54 @@ protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_catego
      * Get the images of an event.
      *
      * @param Post.
-     *
      * @return array
      */
-    protected function get_images( $event )
-    {
+    protected function get_images( $event ) {
         $images         = array();
         $attachment_ids = array();
 
         //get event banner here
-
-
         // Set a placeholder image if the event has no images set.
-        if (empty($images) ) {
+        if( empty( $images ) ) {
             $images[] = array(
-            'id'                => 0,
-            'date_created'      => wpem_rest_api_prepare_date_response(current_time('mysql'), false), // Default to now.
-            'date_created_gmt'  => wpem_rest_api_prepare_date_response(current_time('timestamp', true)), // Default to now.
-            'date_modified'     => wpem_rest_api_prepare_date_response(current_time('mysql'), false),
-            'date_modified_gmt' => wpem_rest_api_prepare_date_response(current_time('timestamp', true)),
-            'src'               => '',
-            'name'              => __('Placeholder', 'wpem-rest-api'),
-            'alt'               => __('Placeholder', 'wpem-rest-api'),
-            'position'          => 0,
+                'id'                => 0,
+                'date_created'      => wpem_rest_api_prepare_date_response( current_time( 'mysql' ), false ), // Default to now.
+                'date_created_gmt'  => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ), // Default to now.
+                'date_modified'     => wpem_rest_api_prepare_date_response( current_time( 'mysql' ), false ),
+                'date_modified_gmt' => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ),
+                'src'               => '',
+                'name'              => __( 'Placeholder', 'wpem-rest-api' ),
+                'alt'               => __( 'Placeholder', 'wpem-rest-api' ),
+                'position'          => 0,
             );
         }
-
         return $images;
     }
 
-
     /**
      * Get event data.
-     *
      * @param $post    Event instance.
      * @param string $context Request context.
      *                        Options: 'view'
      *                        and 'edit'.     
-     *
      * @return array
      */
-    protected function get_event_data( $event, $context = 'view' )
-    {
+    protected function get_event_data( $event, $context = 'view' ) {
         $data = array(
-        'id'                    => $event->ID,
-        'name'                  => $event->post_title,
-        'slug'                  => $event->post_name,
-        'permalink'             => get_permalink($event->ID),
-        'date_created'          => get_the_date('', $event),
-        'date_modified'         => get_the_modified_date('', $event),
-        'status'                => $event->post_status,
-        'featured'              => $event->_featured,
-                
-        'description'           => 'view' === $context ? wpautop(do_shortcode(get_event_description($event))) : get_event_description($event),
-                
-        'event_categories'            => taxonomy_exists('event_listing_category') ? get_the_terms($event->ID, 'event_listing_category') : ''   ,
-        'event_types'            => taxonomy_exists('event_listing_type') ? get_the_terms($event->ID, 'event_listing_type') : '',
-        'event_tags'                  => taxonomy_exists('event_listing_tag') ? get_the_terms($event->ID, 'event_listing_tag') : '',
-        'images'                => get_event_banner($event),
-        //'menu_order'            => '',
-        'meta_data'             =>  get_post_meta($event->ID),
+            'id'               => $event->ID,
+            'name'             => $event->post_title,
+            'slug'             => $event->post_name,
+            'permalink'        => get_permalink( $event->ID ),
+            'date_created'     => get_the_date( '', $event ),
+            'date_modified'    => get_the_modified_date( '', $event ),
+            'status'           => $event->post_status,
+            'featured'         => $event->_featured,
+            'description'      => 'view' === $context ? wpautop( do_shortcode( get_event_description( $event ) ) ) : get_event_description( $event ),
+            'event_categories' => taxonomy_exists( 'event_listing_category' ) ? get_the_terms( $event->ID, 'event_listing_category' ) : ''   ,
+            'event_types'      => taxonomy_exists( 'event_listing_type' ) ? get_the_terms( $event->ID, 'event_listing_type' ) : '',
+            'event_tags'       => taxonomy_exists( 'event_listing_tag' ) ? get_the_terms( $event->ID, 'event_listing_tag' ) : '',
+            'images'           => get_event_banner( $event ),
+            'meta_data'        => get_post_meta( $event->ID ),
         );
         
         return $data;
@@ -330,19 +296,18 @@ protected function get_event_data( $event, $context = 'view' )
      * @param  WP_REST_Request $request Request object.
      * @return WP_REST_Response
      */
-    public function prepare_item_for_response( $post, $request )
-    {
-        $event = get_post($post);
-        $data    = $this->get_event_data($event);
+    public function prepare_item_for_response( $post, $request ) {
+        $event = get_post( $post );
+        $data    = $this->get_event_data( $event );
         
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->add_additional_fields_to_object($data, $request);
-        $data    = $this->filter_response_by_context($data, $context);
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
         
         // Wrap the data in a response object.
-        $response = rest_ensure_response($data);
+        $response = rest_ensure_response( $data );
         
-        $response->add_links($this->prepare_links($event, $request));
+        $response->add_links( $this->prepare_links( $event, $request ) );
         
         /**
          * Filter the data for a response.
@@ -354,7 +319,7 @@ public function prepare_item_for_response( $post, $request )
          * @param WP_Post            $post       Post object.
          * @param WP_REST_Request    $request    Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}", $response, $post, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}", $response, $post, $request );
     }
 
     /**
@@ -365,23 +330,21 @@ public function prepare_item_for_response( $post, $request )
      *
      * @return array                   Links for the given post.
      */
-    protected function prepare_links( $object, $request )
-    {
+    protected function prepare_links( $object, $request ) {
         $links = array(
-        'self'       => array(
-       'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
-        ),
-        'collection' => array(
-       'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
-        ),
+            'self' => array(
+                'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
+            ),
         );
 
-        if ($object->post_parent  ) {
+        if( $object->post_parent  ) {
             $links['up'] = array(
-          'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent  ) ),  // @codingStandardsIgnoreLine.
+                'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent  ) ),  // @codingStandardsIgnoreLine.
             );
         }
-
         return $links;
     }
 
@@ -390,32 +353,28 @@ protected function prepare_links( $object, $request )
      *
      * @param WP_REST_Request $request  Request object.
      * @param bool            $creating If is creating a new object.
-     *
      * @return WP_Error | Post
      */
-    protected function prepare_object_for_database( $request, $creating = false )
-    {
-        $id = isset($request['id']) ? absint($request['id']) : 0;
+    protected function prepare_object_for_database( $request, $creating = false ) {
+        $id = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
 
-        if (isset($request['id']) ) {
-            $event = get_post($id);
-        }
-        else{
-            if(!empty($request['event_title']) && isset($request['event_id'])  && $request['event_id'] == 0 ) {
+        if( isset( $request['id'] ) ) {
+            $event = get_post( $id );
+        } else {
+            if( !empty( $request['event_title'] ) && isset( $request['event_id'] )  && $request['event_id'] == 0 ) {
                 $_POST = $request;
 
                 //we are inserting new event means if there is any already created event cookies we need to remvoe it
-                if(isset($_COOKIE['wp-event-manager-submitting-event-id']) ) {
-                       unset($_COOKIE['wp-event-manager-submitting-event-id']);
+                if( isset( $_COOKIE['wp-event-manager-submitting-event-id'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-id'] );
                 }                
-                if(isset($_COOKIE['wp-event-manager-submitting-event-key']) ) {
-                        unset($_COOKIE['wp-event-manager-submitting-event-key']);
+                if( isset( $_COOKIE['wp-event-manager-submitting-event-key'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-key'] );
                 }
 
-
-                $GLOBALS['event_manager']->forms->get_form('submit-event', array());
-                $form_submit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ));
-                $event_fields =    $form_submit_event_instance->merge_with_custom_fields('frontend');
+                $GLOBALS['event_manager']->forms->get_form( 'submit-event', array() );
+                $form_submit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ) );
+                $event_fields = $form_submit_event_instance->merge_with_custom_fields( 'frontend' );
 
                 //submit current event with $_POST values
                 $form_submit_event_instance ->submit_handler();
@@ -425,20 +384,17 @@ protected function prepare_object_for_database( $request, $creating = false )
                 $form_submit_event_instance->preview_handler();
 
                 //we don't need done status it will be managed by response of the current request
-                if(!$form_submit_event_instance->get_event_id() ) {
-
-                     $validation_errors =  $this->get_errors();
+                if( !$form_submit_event_instance->get_event_id() ) {
+                    $validation_errors =  $this->get_errors();
                     foreach ( $validation_errors as $error ) {
-                        echo  esc_html($error);
+                        echo esc_html( $error );
                     }
                     return;
                 }
-                $event = get_post($form_submit_event_instance->get_event_id());
-            }
-            else{
+                $event = get_post( $form_submit_event_instance->get_event_id() );
+            } else {
                 return;
             }
-
         }
 
         /**
@@ -451,7 +407,7 @@ protected function prepare_object_for_database( $request, $creating = false )
          * @param WP_REST_Request $request  Request object.
          * @param bool            $creating If is creating a new object.
          */
-        return apply_filters("wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating);
+        return apply_filters( "wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating );
     }
 
     /**
@@ -459,77 +415,74 @@ protected function prepare_object_for_database( $request, $creating = false )
      *
      * @param $event  Event instance.
      * @param array $images Images data.
-     *
      * @throws WC_REST_Exception REST API exceptions.
      * @return $event object
      */
-    protected function set_event_images( $event, $images )
-    {
-        $images = is_array($images) ? array_filter($images) : array();
+    protected function set_event_images( $event, $images ) {
+        $images = is_array( $images ) ? array_filter( $images ) : array();
 
-        if (! empty($images) ) {
+        if( !empty( $images ) ) {
             $gallery_positions = array();
-
             foreach ( $images as $index => $image ) {
-                $attachment_id = isset($image['id']) ? absint($image['id']) : 0;
+                $attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
-                if (0 === $attachment_id && isset($image['src']) ) {
-                    $upload = wpem_rest_upload_image_from_url(esc_url_raw($image['src']));
+                if( 0 === $attachment_id && isset( $image['src'] ) ) {
+                    $upload = wpem_rest_upload_image_from_url( esc_url_raw( $image['src'] ) );
 
-                    if (is_wp_error($upload) ) {
-                        if (! apply_filters('wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images) ) {
-                            throw new Exception('wpem_event_image_upload_error', $upload->get_error_message(), 400);
+                    if( is_wp_error( $upload ) ) {
+                        if( !apply_filters( 'wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images ) ) {
+                            throw new Exception( 'wpem_event_image_upload_error', $upload->get_error_message(), 400 );
                         } else {
                             continue;
                         }
                     }
 
-                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment($upload, $event->ID);
+                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment( $upload, $event->ID );
                 }
 
-                if (! wp_attachment_is_image($attachment_id) ) {
+                if( !wp_attachment_is_image( $attachment_id ) ) {
                     /* translators: %s: attachment id */
-                    throw new Exception('wpem_event_invalid_image_id', sprintf(__('#%s is an invalid image ID.', 'wpem-rest-api'), $attachment_id), 400);
+                    throw new Exception( 'wpem_event_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'wpem-rest-api' ), $attachment_id ), 400 );
                 }
 
-                $gallery_positions[ $attachment_id ] = absint(isset($image['position']) ? $image['position'] : $index);
+                $gallery_positions[ $attachment_id ] = absint( isset( $image['position'] ) ? $image['position'] : $index );
 
                 // Set the image alt if present.
-                if (! empty($image['alt']) ) {
-                    update_post_meta($attachment_id, '_wp_attachment_image_alt', wc_clean($image['alt']));
+                if( !empty($image['alt']) ) {
+                    update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
                 }
 
                 // Set the image name if present.
-                if (! empty($image['name']) ) {
+                if( !empty( $image['name'] ) ) {
                     wp_update_post(
                         array(
-                        'ID'         => $attachment_id,
-                        'post_title' => $image['name'],
+                            'ID'         => $attachment_id,
+                            'post_title' => $image['name'],
                         )
                     );
                 }
 
                 // Set the image source if present, for future reference.
-                if (! empty($image['src']) ) {
-                    update_post_meta($attachment_id, '_wpem_attachment_source', esc_url_raw($image['src']));
+                if( !empty( $image['src'] ) ) {
+                    update_post_meta( $attachment_id, '_wpem_attachment_source', esc_url_raw( $image['src'] ) );
                 }
             }
 
             // Sort images and get IDs in correct order.
-            asort($gallery_positions);
+            asort( $gallery_positions );
 
             // Get gallery in correct order.
-            $gallery = array_keys($gallery_positions);
+            $gallery = array_keys( $gallery_positions );
 
             // Featured image is in position 0.
-            $image_id = array_shift($gallery);
+            $image_id = array_shift( $gallery );
 
             // Set images.
-            $event->set_image_id($image_id);
-            $event->set_gallery_image_ids($gallery);
+            $event->set_image_id( $image_id );
+            $event->set_gallery_image_ids( $gallery );
         } else {
-            $event->set_image_id('');
-            $event->set_gallery_image_ids(array());
+            $event->set_image_id( '' );
+            $event->set_gallery_image_ids( array() );
         }
 
         return $event;
@@ -545,18 +498,16 @@ protected function set_event_images( $event, $images )
      *
      * @return Event object
      */
-    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' )
-    {
-        $term_ids = wp_list_pluck($terms, 'id');
-
-        if ('event_listing_category' === $taxonomy ) {
-            $event->set_category_ids($term_ids);
-        } elseif ('event_listing_type' === $taxonomy ) {
-            $event->set_type_ids($term_ids);
-        } elseif ('tag' === $taxonomy ) {
-            $event->set_tag_ids($term_ids);
+    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' ) {
+        $term_ids = wp_list_pluck( $terms, 'id' );
+
+        if( 'event_listing_category' === $taxonomy ) {
+            $event->set_category_ids( $term_ids );
+        } elseif( 'event_listing_type' === $taxonomy ) {
+            $event->set_type_ids( $term_ids );
+        } elseif( 'tag' === $taxonomy ) {
+            $event->set_tag_ids( $term_ids );
         }
-
         return $event;
     }
 
@@ -567,8 +518,7 @@ protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' )
      *
      * @param WC_Data $object Object data.
      */
-    public function clear_transients( $object )
-    {
+    public function clear_transients( $object ) {
         //call wpem clear transient here
     }
 
@@ -579,26 +529,22 @@ public function clear_transients( $object )
      *
      * @return WP_REST_Response|WP_Error
      */
-    public function delete_item( $request )
-    {
+    public function delete_item( $request ) {
         $id     = (int) $request['id'];
         $force  = (bool) $request['force'];
-        $object = $this->get_object((int) $request['id']);
+        $object = $this->get_object( (int) $request['id'] );
         $result = false;
 
-        if (! $object || 0 === $object->ID ) {
+        if( !$object || 0 === $object->ID ) {
             return new WP_Error(
                 "wpem_rest_{$this->post_type}_invalid_id",
                 __('Invalid ID.', 'wpem-rest-api'),
                 array(
-                'status' => 404,
+                    'status' => 404,
                 )
             );
         }
-
-        
-
-        $supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable(array( $object, 'get_status' ));
+        $supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable( array( $object, 'get_status' ) );
 
         /**
          * Filter whether an object is trashable.
@@ -608,77 +554,68 @@ public function delete_item( $request )
          * @param boolean $supports_trash Whether the object type support trashing.
          * @param WC_Data $object         The object being considered for trashing support.
          */
-        $supports_trash = apply_filters("wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object);
+        $supports_trash = apply_filters( "wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
 
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $object->ID) ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $object->ID ) ) {
             return new WP_Error(
                 "wpem_rest_user_cannot_delete_{$this->post_type}",
                 /* translators: %s: post type */
-                sprintf(__('Sorry, you are not allowed to delete %s.', 'wpem-rest-api'), $this->post_type),
+                sprintf( __( 'Sorry, you are not allowed to delete %s.', 'wpem-rest-api' ), $this->post_type ),
                 array(
-                'status' => rest_authorization_required_code(),
+                    'status' => rest_authorization_required_code(),
                 )
             );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_object_for_response($object, $request);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_object_for_response( $object, $request );
 
         // If we're forcing, then delete permanently.
-        if ($force ) {    
-
-            wp_delete_post($object->ID, true);
+        if( $force ) {    
+            wp_delete_post( $object->ID, true );
             //$result = 0 === $object->ID;
             $result = 1;
         } else {
             // If we don't support trashing for this type, error out.
-            if (! $supports_trash ) {
+            if( !$supports_trash ) {
                 return new WP_Error(
                     'wpem_rest_trash_not_supported',
                     /* translators: %s: post type */
-                    sprintf(__('The %s does not support trashing.', 'wpem-rest-api'), $this->post_type),
+                    sprintf( __( 'The %s does not support trashing.', 'wpem-rest-api' ), $this->post_type ),
                     array(
-                    'status' => 501,
+                        'status' => 501,
                     )
                 );
             }
 
             // Otherwise, only trash if we haven't already.
-            if (is_callable(array( $object, 'get_status' )) ) {
-                if ('trash' === $object->get_status() ) {
+            if( is_callable( array( $object, 'get_status' ) ) ) {
+                if( 'trash' === $object->get_status() ) {
                     return new WP_Error(
                         'wpem_rest_already_trashed',
                         /* translators: %s: post type */
-                        sprintf(__('The %s has already been deleted.', 'wpem-rest-api'), $this->post_type),
+                        sprintf( __( 'The %s has already been deleted.', 'wpem-rest-api' ), $this->post_type ),
                         array(
-                        'status' => 410,
+                            'status' => 410,
                         )
                     );
                 }
-
-                wp_delete_post($object->ID);
+                wp_delete_post( $object->ID );
                 $result = 'trash' === $object->get_status();
             }
         }
 
-        if (! $result ) {
+        if( !$result ) {
             return new WP_Error(
                 'wpem_rest_cannot_delete',
                 /* translators: %s: post type */
-                sprintf(__('The %s cannot be deleted.', 'wpem-rest-api'), $this->post_type),
+                sprintf( __( 'The %s cannot be deleted.', 'wpem-rest-api' ), $this->post_type ),
                 array(
-                'status' => 500,
+                    'status' => 500,
                 )
             );
         }
 
-        /*
-        // Delete parent event transients.
-        if ( 0 !== $object->get_parent_id() ) {
-        wpem_delete_event_transients( $object->get_parent_id() );
-        }
-        */
-
         /**
          * Fires after a single object is deleted or trashed via the REST API.
          *
@@ -686,8 +623,7 @@ public function delete_item( $request )
          * @param WP_REST_Response $response The response data.
          * @param WP_REST_Request  $request  The request sent to the API.
          */
-        do_action("wpem_rest_delete_{$this->post_type}_object", $object, $response, $request);
-
+        do_action( "wpem_rest_delete_{$this->post_type}_object", $object, $response, $request );
         return $response;
     }
 
@@ -696,231 +632,227 @@ public function delete_item( $request )
      *
      * @return array
      */
-    public function get_item_schema()
-    {
-        $weight_unit    = get_option('wpem_weight_unit');
-        $dimension_unit = get_option('wpem_dimension_unit');
+    public function get_item_schema() {
+
+        $weight_unit    = get_option( 'wpem_weight_unit' );
+        $dimension_unit = get_option( 'wpem_dimension_unit' );
         $schema         = array(
-        '$schema'    => 'http://json-schema.org/draft-04/schema#',
-        'title'      => $this->post_type,
-        'type'       => 'object',
-        'properties' => array(
-        'id'                    => array(
-        'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-        'type'        => 'integer',
-        'context'     => array( 'view', 'edit' ),
-        'readonly'    => true,
-        ),
-        'name'                  => array(
-                    'description' => __('Event name.', 'wpem-rest-api'),
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+            'properties' => array(
+                'id' => array(
+                    'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'name' => array(
+                    'description' => __( 'Event name.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'slug'                  => array(
-                    'description' => __('event slug.', 'wpem-rest-api'),
+                ),
+                'slug' => array(
+                    'description' => __( 'event slug.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'permalink'             => array(
-                    'description' => __('event URL.', 'wpem-rest-api'),
+                ),
+                'permalink' => array(
+                    'description' => __( 'event URL.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'format'      => 'uri',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created'          => array(
-                    'description' => __("The date the event was created, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_created' => array(
+                    'description' => __( "The date the event was created, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created_gmt'      => array(
-                    'description' => __('The date the event was created, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_created_gmt' => array(
+                    'description' => __( 'The date the event was created, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified'         => array(
-                    'description' => __("The date the event was last modified, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_modified' => array(
+                    'description' => __( "The date the event was last modified, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified_gmt'     => array(
-                    'description' => __('The date the event was last modified, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_modified_gmt' => array(
+                    'description' => __( 'The date the event was last modified, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-            
-        'status'                => array(
-                    'description' => __('Event status (post status).', 'wpem-rest-api'),
+                ),
+                'status'                => array(
+                    'description' => __( 'Event status (post status).', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'default'     => 'publish',
                     'enum'        => array_merge(array_keys(get_post_statuses()), array( 'future' )),
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'featured'              => array(
-                    'description' => __('Featured event.', 'wpem-rest-api'),
+                ),
+                'featured' => array(
+                    'description' => __( 'Featured event.', 'wpem-rest-api' ),
                     'type'        => 'boolean',
                     'default'     => false,
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'description'           => array(
-                    'description' => __('Event description.', 'wpem-rest-api'),
+                ),
+                'description' => array(
+                    'description' => __( 'Event description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'short_description'     => array(
-                    'description' => __('Event short description.', 'wpem-rest-api'),
+                ),
+                'short_description' => array(
+                    'description' => __( 'Event short description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-                
-        'categories'            => array(
-                    'description' => __('List of categories.', 'wpem-rest-api'),
+                ),
+                'categories' => array(
+                    'description' => __( 'List of categories.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'   => array(
-                                'description' => __('Category ID.', 'wpem-rest-api'),
+                                'description' => __( 'Category ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Category name.', 'wpem-rest-api'),
+                                'description' => __( 'Category name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Category slug.', 'wpem-rest-api'),
+                                'description' => __( 'Category slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'tags'                  => array(
-                    'description' => __('List of tags.', 'wpem-rest-api'),
+                    ),
+                ),
+                'tags' => array(
+                    'description' => __( 'List of tags.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'   => array(
-                                'description' => __('Tag ID.', 'wpem-rest-api'),
+                                'description' => __( 'Tag ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Tag name.', 'wpem-rest-api'),
+                                'description' => __( 'Tag name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Tag slug.', 'wpem-rest-api'),
+                                'description' => __ ('Tag slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'images'                => array(
-                    'description' => __('List of images.', 'wpem-rest-api'),
+                    ),
+                 ),
+                'images' => array(
+                    'description' => __( 'List of images.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'                => array(
-                                'description' => __('Image ID.', 'wpem-rest-api'),
+                                'description' => __( 'Image ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'date_created'      => array(
-                                'description' => __("The date the image was created, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was created, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_created_gmt'  => array(
-                                'description' => __('The date the image was created, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was created, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified'     => array(
-                                'description' => __("The date the image was last modified, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was last modified, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified_gmt' => array(
-                                'description' => __('The date the image was last modified, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was last modified, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'src'               => array(
-                                'description' => __('Image URL.', 'wpem-rest-api'),
+                                'description' => __( 'Image URL.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'format'      => 'uri',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name'              => array(
-                                'description' => __('Image name.', 'wpem-rest-api'),
+                                'description' => __( 'Image name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'alt'               => array(
-                                'description' => __('Image alternative text.', 'wpem-rest-api'),
+                                'description' => __( 'Image alternative text.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'position'          => array(
-                                'description' => __('Image position. 0 means that the image is featured.', 'wpem-rest-api'),
+                                'description' => __( 'Image position. 0 means that the image is featured.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-                
-        'meta_data'             => array(
-                    'description' => __('Meta data.', 'wpem-rest-api'),
+                    ),
+                ),
+                'meta_data' => array(
+                    'description' => __( 'Meta data.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'    => array(
-                                'description' => __('Meta ID.', 'wpem-rest-api'),
+                                'description' => __( 'Meta ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'key'   => array(
-                                'description' => __('Meta key.', 'wpem-rest-api'),
+                                'description' => __( 'Meta key.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'value' => array(
-                                'description' => __('Meta value.', 'wpem-rest-api'),
+                                'description' => __( 'Meta value.', 'wpem-rest-api' ),
                                 'type'        => 'mixed',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-        ),
+                    ),
+                ),
+            ),
         );
-
         return $this->add_additional_fields_schema($schema);
     }
 
@@ -929,46 +861,42 @@ public function get_item_schema()
      *
      * @return array
      */
-    public function get_collection_params()
-    {
+    public function get_collection_params() {
         $params = parent::get_collection_params();
 
-        $params['orderby']['enum'] = array_merge($params['orderby']['enum'], array( 'menu_order' ));
+        $params['orderby']['enum'] = array_merge( $params['orderby']['enum'], array( 'menu_order' ) );
 
-        $params['slug']           = array(
-        'description'       => __('Limit result set to events with a specific slug.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['slug'] = array(
+            'description'       => __( 'Limit result set to events with a specific slug.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['status']         = array(
-        'default'           => 'any',
-        'description'       => __('Limit result set to events assigned a specific status.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'enum'              => array_merge(array( 'any', 'future' ), array_keys(get_post_statuses())),
-        'sanitize_callback' => 'sanitize_key',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['status'] = array(
+            'default'           => 'any',
+            'description'       => __( 'Limit result set to events assigned a specific status.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'enum'              => array_merge(array( 'any', 'future' ), array_keys(get_post_statuses())),
+            'sanitize_callback' => 'sanitize_key',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-    
-        $params['featured']       = array(
-        'description'       => __('Limit result set to featured events.', 'wpem-rest-api'),
-        'type'              => 'boolean',
-        'sanitize_callback' => 'wc_string_to_bool',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['featured'] = array(
+            'description'       => __( 'Limit result set to featured events.', 'wpem-rest-api' ),
+            'type'              => 'boolean',
+            'sanitize_callback' => 'wc_string_to_bool',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['category']       = array(
-        'description'       => __('Limit result set to events assigned a specific category ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['category'] = array(
+            'description'       => __( 'Limit result set to events assigned a specific category ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        $params['tag']            = array(
-        'description'       => __('Limit result set to events assigned a specific tag ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+        $params['tag'] = array(
+            'description'       => __( 'Limit result set to events assigned a specific tag ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        
-
         return $params;
     }
     
@@ -977,12 +905,7 @@ public function get_collection_params()
      *
      * @return array
      */
-    public function check_event_permissions($request)
-    {
-        
-    }
-    
+    public function check_event_permissions($request) { }    
 }
 
-
-new WPEM_REST_Events_Controller();
+new WPEM_REST_Events_Controller();
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-posts-conroller.php b/includes/rest-api/wpem-rest-posts-conroller.php
index c557b48..b786f57 100644
--- a/includes/rest-api/wpem-rest-posts-conroller.php
+++ b/includes/rest-api/wpem-rest-posts-conroller.php
@@ -6,7 +6,7 @@
  * @version 1.0.0
  */
 
-if (! defined('ABSPATH') ) {
+if( !defined( 'ABSPATH' ) ) {
     exit;
 }
 
@@ -15,33 +15,28 @@
  *
  * @version 2.6.0
  */
-abstract class WPEM_REST_Posts_Controller extends WPEM_REST_Controller
-{
+abstract class WPEM_REST_Posts_Controller extends WPEM_REST_Controller {
 
     /**
      * Endpoint namespace.
-     *
      * @var string
      */
     protected $namespace = 'wpem';
 
     /**
      * Route base.
-     *
      * @var string
      */
     protected $rest_base = '';
 
     /**
      * Post type.
-     *
      * @var string
      */
     protected $post_type = '';
 
     /**
      * Controls visibility on frontend.
-     *
      * @var string
      */
     protected $public = false;
@@ -53,8 +48,8 @@ abstract class WPEM_REST_Posts_Controller extends WPEM_REST_Controller
      * @return WP_Error|boolean
      */
     public function get_items_permissions_check( $request ) {
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'read') ) {
-            return new WP_Error('wpem_rest_cannot_view', __('Sorry, you cannot list resources.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'read' ) ) {
+            return new WP_Error( 'wpem_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
         return true;
     }
@@ -65,12 +60,10 @@ public function get_items_permissions_check( $request ) {
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|boolean
      */
-    public function create_item_permissions_check( $request )
-    {
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'create') ) {
-            return new WP_Error('wpem_rest_cannot_create', __('Sorry, you are not allowed to create resources.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+    public function create_item_permissions_check( $request ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'create' ) ) {
+            return new WP_Error( 'wpem_rest_cannot_create', __( 'Sorry, you are not allowed to create resources.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
-
         return true;
     }
 
@@ -80,14 +73,11 @@ public function create_item_permissions_check( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|boolean
      */
-    public function get_item_permissions_check( $request )
-    {
-        $post = get_post((int) $request['id']);
-
-        if ($post && ! wpem_rest_api_check_post_permissions($this->post_type, 'read', $post->ID) ) {
-            return new WP_Error('wpem_rest_cannot_view', __('Sorry, you cannot view this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+    public function get_item_permissions_check( $request ) {
+        $post = get_post( (int) $request['id'] );
+        if( $post && ! wpem_rest_api_check_post_permissions( $this->post_type, 'read', $post->ID ) ) {
+            return new WP_Error( 'wpem_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
-
         return true;
     }
 
@@ -97,14 +87,12 @@ public function get_item_permissions_check( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|boolean
      */
-    public function update_item_permissions_check( $request )
-    {
-        $post = get_post((int) $request['id']);
+    public function update_item_permissions_check( $request ) {
+        $post = get_post( (int) $request['id'] );
 
-        if ($post && ! wpem_rest_api_check_post_permissions($this->post_type, 'edit', $post->ID) ) {
-            return new WP_Error('wpem_rest_cannot_edit', __('Sorry, you are not allowed to edit this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+        if( $post && ! wpem_rest_api_check_post_permissions( $this->post_type, 'edit', $post->ID ) ) {
+            return new WP_Error( 'wpem_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
-
         return true;
     }
 
@@ -114,14 +102,12 @@ public function update_item_permissions_check( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return bool|WP_Error
      */
-    public function delete_item_permissions_check( $request )
-    {
-        $post = get_post((int) $request['id']);
+    public function delete_item_permissions_check( $request ) {
+        $post = get_post( (int) $request['id'] );
 
-        if ($post && ! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $post->ID) ) {
-            return new WP_Error('wpem_rest_cannot_delete', __('Sorry, you are not allowed to delete this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+        if( $post && ! wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
+            return new WP_Error( 'wpem_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
-
         return true;
     }
 
@@ -129,15 +115,12 @@ public function delete_item_permissions_check( $request )
      * Check if a given request has access batch create, update and delete items.
      *
      * @param WP_REST_Request $request Full details about the request.
-     *
      * @return boolean|WP_Error
      */
-    public function batch_items_permissions_check( $request )
-    {
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'batch') ) {
-            return new WP_Error('wpem_rest_cannot_batch', __('Sorry, you are not allowed to batch manipulate this resource.', 'wpem-rest-api'), array( 'status' => rest_authorization_required_code() ));
+    public function batch_items_permissions_check( $request ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'batch' ) ) {
+            return new WP_Error( 'wpem_rest_cannot_batch', __( 'Sorry, you are not allowed to batch manipulate this resource.', 'wpem-rest-api' ), array( 'status' => rest_authorization_required_code() ) );
         }
-
         return true;
     }
 
@@ -147,20 +130,19 @@ public function batch_items_permissions_check( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function get_item( $request )
-    {
+    public function get_item( $request ) {
         $id   = (int) $request['id'];
-        $post = get_post($id);
+        $post = get_post( $id );
 
-        if (empty($id) || empty($post->ID) || $post->post_type !== $this->post_type ) {
-            return new WP_Error("wpem_rest_invalid_{$this->post_type}_id", __('Invalid ID.', 'wpem-rest-api'), array( 'status' => 404 ));
+        if ( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+            return new WP_Error( "wpem_rest_invalid_{$this->post_type}_id", __( 'Invalid ID.', 'wpem-rest-api' ), array( 'status' => 404 ) );
         }
 
-        $data = $this->prepare_item_for_response($post, $request);
-        $response = rest_ensure_response($data);
+        $data = $this->prepare_item_for_response( $post, $request );
+        $response = rest_ensure_response( $data );
 
-        if ($this->public ) {
-            $response->link_header('alternate', get_permalink($id), array( 'type' => 'text/html' ));
+        if( $this->public ) {
+            $response->link_header( 'alternate', get_permalink( $id ), array( 'type' => 'text/html' ) );
         }
 
         /**
@@ -169,9 +151,7 @@ public function get_item( $request )
          * @param WP_Post         $post      Post object.
          * @param WP_REST_Request $request   Request object.
          */
-        do_action("wpem_rest_single_{$this->post_type}", $post, $request);
-
-
+        do_action( "wpem_rest_single_{$this->post_type}", $post, $request );
         return $response;
     }
 
@@ -181,41 +161,38 @@ public function get_item( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function create_item( $request )
-    {
-        if (! empty($request['id']) ) {
-            /* translators: %s: post type */
-            return new WP_Error("wpem_rest_{$this->post_type}_exists", sprintf(__('Cannot create existing %s.', 'wpem-rest-api'), $this->post_type), array( 'status' => 400 ));
+    public function create_item( $request ){
+        if( !empty($request['id'] ) ) {
+            return new WP_Error( "wpem_rest_{$this->post_type}_exists", sprintf( __( 'Cannot create existing %s.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 400 ) );
         }
 
-        $post = $this->prepare_item_for_database($request);
-        if (is_wp_error($post) ) {
+        $post = $this->prepare_item_for_database( $request );
+        if( is_wp_error( $post ) ) {
             return $post;
         }
 
         $post->post_type = $this->post_type;
-        $post_id         = wp_insert_post($post, true);
+        $post_id         = wp_insert_post( $post, true );
 
-        if (is_wp_error($post_id) ) {
+        if( is_wp_error( $post_id ) ) {
 
-            if (in_array($post_id->get_error_code(), array( 'db_insert_error' )) ) {
-                $post_id->add_data(array( 'status' => 500 ));
+            if( in_array( $post_id->get_error_code(), array( 'db_insert_error' ) ) ) {
+                $post_id->add_data( array( 'status' => 500 ) );
             } else {
-                $post_id->add_data(array( 'status' => 400 ));
+                $post_id->add_data( array( 'status' => 400 ) );
             }
             return $post_id;
         }
         $post->ID = $post_id;
-        $post     = get_post($post_id);
+        $post     = get_post( $post_id );
 
-        $this->update_additional_fields_for_object($post, $request);
+        $this->update_additional_fields_for_object( $post, $request );
 
         // Add meta fields.
-        $meta_fields = $this->add_post_meta_fields($post, $request);
+        $meta_fields = $this->add_post_meta_fields( $post, $request );
         if (is_wp_error($meta_fields) ) {
             // Remove post.
             $this->delete_post($post);
-
             return $meta_fields;
         }
 
@@ -225,14 +202,14 @@ public function create_item( $request )
          * @param WP_Post         $post      Post object.
          * @param WP_REST_Request $request   Request object.
          * @param boolean         $creating  True when creating item, false when updating.
-         */
-        do_action("wpem_rest_insert_{$this->post_type}", $post, $request, true);
+         */ 
+        do_action( "wpem_rest_insert_{$this->post_type}", $post, $request, true );
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_item_for_response($post, $request);
-        $response = rest_ensure_response($response);
-        $response->set_status(201);
-        $response->header('Location', rest_url(sprintf('/%s/%s/%d', $this->namespace, $this->rest_base, $post_id)));
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_item_for_response( $post, $request );
+        $response = rest_ensure_response( $response );
+        $response->set_status( 201 );
+        $response->header( 'Location', rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post_id ) ) );
 
         return $response;
     }
@@ -244,8 +221,7 @@ public function create_item( $request )
      * @param  WP_REST_Request $request WP_REST_Request Object.
      * @return bool|WP_Error
      */
-    protected function add_post_meta_fields( $post, $request )
-    {
+    protected function add_post_meta_fields( $post, $request ) {
         return true;
     }
 
@@ -254,9 +230,8 @@ protected function add_post_meta_fields( $post, $request )
      *
      * @param WP_Post $post Post object.
      */
-    protected function delete_post( $post )
-    {
-        wp_delete_post($post->ID, true);
+    protected function delete_post( $post ) {
+        wp_delete_post( $post->ID, true );
     }
 
     /**
@@ -265,36 +240,35 @@ protected function delete_post( $post )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function update_item( $request )
-    {
+    public function update_item( $request ) {
         $id   = (int) $request['id'];
-        $post = get_post($id);
+        $post = get_post( $id );
 
-        if (empty($id) || empty($post->ID) || $post->post_type !== $this->post_type ) {
-            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('ID is invalid.', 'wpem-rest-api'), array( 'status' => 400 ));
+        if( empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'wpem-rest-api' ), array( 'status' => 400 ) );
         }
 
-        $post = $this->prepare_item_for_database($request);
-        if (is_wp_error($post) ) {
+        $post = $this->prepare_item_for_database( $request );
+        if( is_wp_error( $post ) ) {
             return $post;
         }
         // Convert the post object to an array, otherwise wp_update_post will expect non-escaped input.
-        $post_id = wp_update_post((array) $post, true);
-        if (is_wp_error($post_id) ) {
-            if (in_array($post_id->get_error_code(), array( 'db_update_error' )) ) {
-                $post_id->add_data(array( 'status' => 500 ));
+        $post_id = wp_update_post( (array) $post, true );
+        if( is_wp_error( $post_id ) ) {
+            if( in_array( $post_id->get_error_code(), array( 'db_update_error' ) ) ) {
+                $post_id->add_data( array( 'status' => 500 ) );
             } else {
-                $post_id->add_data(array( 'status' => 400 ));
+                $post_id->add_data( array( 'status' => 400 ) );
             }
             return $post_id;
         }
 
-        $post = get_post($post_id);
-        $this->update_additional_fields_for_object($post, $request);
+        $post = get_post( $post_id );
+        $this->update_additional_fields_for_object( $post, $request );
 
         // Update meta fields.
-        $meta_fields = $this->update_post_meta_fields($post, $request);
-        if (is_wp_error($meta_fields) ) {
+        $meta_fields = $this->update_post_meta_fields( $post, $request );
+        if( is_wp_error( $meta_fields ) ) {
             return $meta_fields;
         }
 
@@ -305,11 +279,11 @@ public function update_item( $request )
          * @param WP_REST_Request $request   Request object.
          * @param boolean         $creating  True when creating item, false when updating.
          */
-        do_action("wpem_rest_insert_{$this->post_type}", $post, $request, false);
+        do_action( "wpem_rest_insert_{$this->post_type}", $post, $request, false );
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_item_for_response($post, $request);
-        return rest_ensure_response($response);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_item_for_response( $post, $request );
+        return rest_ensure_response( $response );
     }
 
     /**
@@ -318,8 +292,7 @@ public function update_item( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_Error|WP_REST_Response
      */
-    public function get_items( $request )
-    {
+    public function get_items( $request ) {
         $args                         = array();
         $args['offset']               = $request['offset'];
         $args['order']                = $request['order'];
@@ -335,19 +308,19 @@ public function get_items( $request )
 
         $args['date_query'] = array();
         // Set before into date query. Date query must be specified as an array of an array.
-        if (isset($request['before']) ) {
+        if( isset( $request['before'] ) ) {
             $args['date_query'][0]['before'] = $request['before'];
         }
 
         // Set after into date query. Date query must be specified as an array of an array.
-        if (isset($request['after']) ) {
+        if( isset( $request['after'] ) ) {
             $args['date_query'][0]['after'] = $request['after'];
         }
 
-        if ('wpem/' === $this->namespace ) {
-            if (is_array($request['filter']) ) {
-                $args = array_merge($args, $request['filter']);
-                unset($args['filter']);
+        if( 'wpem/' === $this->namespace ) {
+            if( is_array( $request['filter'] ) ) {
+                $args = array_merge( $args, $request['filter'] );
+                unset( $args['filter'] );
             }
         }
 
@@ -363,66 +336,61 @@ public function get_items( $request )
          * @param array           $args    Key value array of query var to query value.
          * @param WP_REST_Request $request The request used.
          */
-        $args = apply_filters("wpem_rest_{$this->post_type}_query", $args, $request);
-        $query_args = $this->prepare_items_query($args, $request);
+        $args = apply_filters( "wpem_rest_{$this->post_type}_query", $args, $request );
+        $query_args = $this->prepare_items_query( $args, $request );
 
         $posts_query = new WP_Query();
-        $query_result = $posts_query->query($query_args);
+        $query_result = $posts_query->query( $query_args );
 
         $posts = array();
-        foreach ( $query_result as $post ) {
-            if (! wpem_rest_api_check_post_permissions($this->post_type, 'read', $post->ID) ) {
+        foreach( $query_result as $post ) {
+            if( !wpem_rest_api_check_post_permissions( $this->post_type, 'read', $post->ID ) ) {
                 continue;
             }
 
-            $data = $this->prepare_item_for_response($post, $request);
-            $posts[] = $this->prepare_response_for_collection($data);
+            $data = $this->prepare_item_for_response( $post, $request );
+            $posts[] = $this->prepare_response_for_collection( $data );
         }
 
         $page = (int) $query_args['paged'];
         $total_posts = $posts_query->found_posts;
 
-        if ($total_posts < 1 ) {
+        if( $total_posts < 1 ) {
             // Out-of-bounds, run the query again without LIMIT for total count.
             unset($query_args['paged']);
             $count_query = new WP_Query();
-            $count_query->query($query_args);
+            $count_query->query($query_args );
             $total_posts = $count_query->found_posts;
-
-
         }
 
-        $max_pages = ceil($total_posts / (int) $query_args['posts_per_page']);
+        $max_pages = ceil( $total_posts / (int) $query_args['posts_per_page'] );
 
-        $response = rest_ensure_response($posts);
-        $response->header('X-WP-Total', (int) $total_posts);
-        $response->header('X-WP-TotalPages', (int) $max_pages);
+        $response = rest_ensure_response( $posts );
+        $response->header( 'X-WP-Total', (int) $total_posts );
+        $response->header( 'X-WP-TotalPages', (int) $max_pages );
 
         $request_params = $request->get_query_params();
-        if (! empty($request_params['filter']) ) {
+        if( !empty( $request_params['filter'] ) ) {
             // Normalize the pagination params.
-            unset($request_params['filter']['posts_per_page']);
-            unset($request_params['filter']['paged']);
+            unset( $request_params['filter']['posts_per_page'] );
+            unset( $request_params['filter']['paged'] );
         }
-        $base = add_query_arg($request_params, rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)));
+        $base = add_query_arg( $request_params, rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ) );
 
-        if ($page > 1 ) {
+        if( $page > 1 ) {
             $prev_page = $page - 1;
-            if ($prev_page > $max_pages ) {
+            if( $prev_page > $max_pages ) {
                 $prev_page = $max_pages;
             }
-            $prev_link = add_query_arg('page', $prev_page, $base);
-            $response->link_header('prev', $prev_link);
+            $prev_link = add_query_arg( 'page', $prev_page, $base );
+            $response->link_header( 'prev', $prev_link );
         }
-        if ($max_pages > $page ) {
+        if( $max_pages > $page ) {
             $next_page = $page + 1;
-            $next_link = add_query_arg('page', $next_page, $base);
-            $response->link_header('next', $next_link);
+            $next_link = add_query_arg( 'page', $next_page, $base );
+            $response->link_header( 'next', $next_link );
         }
 
-
-
-
         return $response;
     }
 
@@ -432,16 +400,14 @@ public function get_items( $request )
      * @param  WP_REST_Request $request Full details about the request.
      * @return WP_REST_Response|WP_Error
      */
-    public function delete_item( $request )
-    {
+    public function delete_item( $request ) {
         $id    = (int) $request['id'];
         $force = (bool) $request['force'];
-        $post  = get_post($id);
+        $post  = get_post( $id );
 
-        if (empty($id) || empty($post->ID) || $post->post_type !== $this->post_type ) {
-            return new WP_Error("wpem_rest_{$this->post_type}_invalid_id", __('ID is invalid.', 'wpem-rest-api'), array( 'status' => 404 ));
+        if(empty( $id ) || empty( $post->ID ) || $post->post_type !== $this->post_type ) {
+            return new WP_Error( "wpem_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'wpem-rest-api' ), array( 'status' => 404 ) );
         }
-
         $supports_trash = EMPTY_TRASH_DAYS > 0;
 
         /**
@@ -452,40 +418,39 @@ public function delete_item( $request )
          * @param boolean $supports_trash Whether the item type support trashing.
          * @param WP_Post $post           The Post object being considered for trashing support.
          */
-        $supports_trash = apply_filters("wpem_rest_{$this->post_type}_trashable", $supports_trash, $post);
+        $supports_trash = apply_filters( "wpem_rest_{$this->post_type}_trashable", $supports_trash, $post );
 
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $post->ID) ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
             /* translators: %s: post type */
-            return new WP_Error("wpem_rest_user_cannot_delete_{$this->post_type}", sprintf(__('Sorry, you are not allowed to delete %s.', 'wpem-rest-api'), $this->post_type), array( 'status' => rest_authorization_required_code() ));
+            return new WP_Error( "wpem_rest_user_cannot_delete_{$this->post_type}", sprintf( __( 'Sorry, you are not allowed to delete %s.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => rest_authorization_required_code() ) );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_item_for_response($post, $request);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_item_for_response( $post, $request );
 
         // If we're forcing, then delete permanently.
-        if ($force ) {
-            $result = wp_delete_post($id, true);
+        if( $force ) {
+            $result = wp_delete_post( $id, true );
         } else {
             // If we don't support trashing for this type, error out.
-            if (! $supports_trash ) {
+            if( !$supports_trash ) {
                 /* translators: %s: post type */
-                return new WP_Error('wpem_rest_trash_not_supported', sprintf(__('The %s does not support trashing.', 'wpem-rest-api'), $this->post_type), array( 'status' => 501 ));
+                return new WP_Error( 'wpem_rest_trash_not_supported', sprintf( __( 'The %s does not support trashing.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 501 ) );
             }
 
             // Otherwise, only trash if we haven't already.
-            if ('trash' === $post->post_status ) {
+            if( 'trash' === $post->post_status ) {
                 /* translators: %s: post type */
-                return new WP_Error('wpem_rest_already_trashed', sprintf(__('The %s has already been deleted.', 'wpem-rest-api'), $this->post_type), array( 'status' => 410 ));
+                return new WP_Error('wpem_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 410 ) );
             }
 
             // (Note that internally this falls through to `wp_delete_post` if
             // the trash is disabled.)
-            $result = wp_trash_post($id);
+            $result = wp_trash_post( $id );
         }
-
-        if (! $result ) {
+        if( !$result ) {
             /* translators: %s: post type */
-            return new WP_Error('wpem_rest_cannot_delete', sprintf(__('The %s cannot be deleted.', 'wpem-rest-api'), $this->post_type), array( 'status' => 500 ));
+            return new WP_Error( 'wpem_rest_cannot_delete', sprintf( __( 'The %s cannot be deleted.', 'wpem-rest-api' ), $this->post_type ), array( 'status' => 500 ) );
         }
 
         /**
@@ -495,8 +460,7 @@ public function delete_item( $request )
          * @param WP_REST_Response $response The response data.
          * @param WP_REST_Request  $request  The request sent to the API.
          */
-        do_action("wpem_rest_delete_{$this->post_type}", $post, $response, $request);
-
+        do_action( "wpem_rest_delete_{$this->post_type}", $post, $response, $request );
         return $response;
     }
 
@@ -507,17 +471,15 @@ public function delete_item( $request )
      * @param  WP_REST_Request $request Request object.
      * @return array Links for the given post.
      */
-    protected function prepare_links( $post, $request )
-    {
+    protected function prepare_links( $post, $request ) {
         $links = array(
-        'self' => array(
-        'href' => rest_url(sprintf('/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID)),
-        ),
-        'collection' => array(
-        'href' => rest_url(sprintf('/%s/%s', $this->namespace, $this->rest_base)),
-        ),
+            'self' => array(
+                'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $post->ID ) ),
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),
+            ),
         );
-
         return $links;
     }
 
@@ -529,44 +491,39 @@ protected function prepare_links( $post, $request )
      * @param  WP_REST_Request $request       Request object.
      * @return array          $query_args
      */
-    protected function prepare_items_query( $prepared_args = array(), $request = null )
-    {
+    protected function prepare_items_query( $prepared_args = array(), $request = null ) {
 
-        $valid_vars = array_flip($this->get_allowed_query_vars());
+        $valid_vars = array_flip( $this->get_allowed_query_vars() );
         $query_args = array();
-        foreach ( $valid_vars as $var => $index ) {
-            if (isset($prepared_args[ $var ]) ) {
+        foreach( $valid_vars as $var => $index ) {
+            if( isset( $prepared_args[ $var ] ) ) {
                 /**
                  * Filter the query_vars used in `get_items` for the constructed query.
-                 *
                  * The dynamic portion of the hook name, $var, refers to the query_var key.
                  *
                  * @param mixed $prepared_args[ $var ] The query_var value.
                  */
-                $query_args[ $var ] = apply_filters("wpem_rest_query_var-{$var}", $prepared_args[ $var ]);
+                $query_args[ $var ] = apply_filters( "wpem_rest_query_var-{$var}", $prepared_args[ $var ] );
             }
         }
 
         $query_args['ignore_sticky_posts'] = true;
 
-        if ('include' === $query_args['orderby'] ) {
+        if( 'include' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'post__in';
-        } elseif ('id' === $query_args['orderby'] ) {
+        } elseif('id' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'ID'; // ID must be capitalized.
-        } elseif ('slug' === $query_args['orderby'] ) {
+        } elseif('slug' === $query_args['orderby'] ) {
             $query_args['orderby'] = 'name';
         }
-
         return $query_args;
     }
 
     /**
      * Get all the WP Query vars that are allowed for the API request.
-     *
      * @return array
      */
-    protected function get_allowed_query_vars()
-    {
+    protected function get_allowed_query_vars() {
         global $wp;
 
         /**
@@ -576,10 +533,10 @@ protected function get_allowed_query_vars()
          *
          * @param array  Array of allowed WP_Query query vars.
          */
-        $valid_vars = apply_filters('query_vars', $wp->public_query_vars);
+        $valid_vars = apply_filters( 'query_vars', $wp->public_query_vars );
 
-        $post_type_obj = get_post_type_object($this->post_type);
-        if (current_user_can($post_type_obj->cap->edit_posts) ) {
+        $post_type_obj = get_post_type_object( $this->post_type );
+        if( current_user_can( $post_type_obj->cap->edit_posts ) ) {
             /**
              * Filter the allowed 'private' query vars for authorized users.
              *
@@ -593,28 +550,28 @@ protected function get_allowed_query_vars()
              * @param array $private_query_vars Array of allowed query vars for authorized users.
              * }
              */
-            $private = apply_filters('wpem_rest_private_query_vars', $wp->private_query_vars);
-            $valid_vars = array_merge($valid_vars, $private);
+            $private = apply_filters( 'wpem_rest_private_query_vars', $wp->private_query_vars );
+            $valid_vars = array_merge( $valid_vars, $private );
         }
         // Define our own in addition to WP's normal vars.
         $rest_valid = array(
-        'date_query',
-        'ignore_sticky_posts',
-        'offset',
-        'post__in',
-        'post__not_in',
-        'post_parent',
-        'post_parent__in',
-        'post_parent__not_in',
-        'posts_per_page',
-        'meta_query',
-        'tax_query',
-        'meta_key',
-        'meta_value',
-        'meta_compare',
-        'meta_value_num',
+            'date_query',
+            'ignore_sticky_posts',
+            'offset',
+            'post__in',
+            'post__not_in',
+            'post_parent',
+            'post_parent__in',
+            'post_parent__not_in',
+            'posts_per_page',
+            'meta_query',
+            'tax_query',
+            'meta_key',
+            'meta_value',
+            'meta_compare',
+            'meta_value_num',
         );
-        $valid_vars = array_merge($valid_vars, $rest_valid);
+        $valid_vars = array_merge( $valid_vars, $rest_valid );
 
         /**
          * Filter allowed query vars for the REST API.
@@ -629,7 +586,7 @@ protected function get_allowed_query_vars()
          *    @param string $allowed_query_var The query var to allow.
          * }
          */
-        $valid_vars = apply_filters('wpem_rest_query_vars', $valid_vars);
+        $valid_vars = apply_filters( 'wpem_rest_query_vars', $valid_vars );
 
         return $valid_vars;
     }
@@ -639,99 +596,97 @@ protected function get_allowed_query_vars()
      *
      * @return array
      */
-    public function get_collection_params()
-    {
+    public function get_collection_params() {
         $params = parent::get_collection_params();
 
         $params['context']['default'] = 'view';
 
         $params['after'] = array(
-        'description'        => __('Limit response to resources published after a given ISO8601 compliant date.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'format'             => 'date-time',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Limit response to resources published after a given ISO8601 compliant date.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'format'             => 'date-time',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['before'] = array(
-        'description'        => __('Limit response to resources published before a given ISO8601 compliant date.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'format'             => 'date-time',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Limit response to resources published before a given ISO8601 compliant date.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'format'             => 'date-time',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['exclude'] = array(
-        'description'       => __('Ensure result set excludes specific IDs.', 'wpem-rest-api'),
-        'type'              => 'array',
-        'items'             => array(
-        'type'          => 'integer',
-        ),
-        'default'           => array(),
-        'sanitize_callback' => 'wp_parse_id_list',
-        );
+            'description'       => __( 'Ensure result set excludes specific IDs.', 'wpem-rest-api' ),
+            'type'              => 'array',
+            'items'             => array(
+                'type'          => 'integer',
+            ),
+            'default'           => array(),
+            'sanitize_callback' => 'wp_parse_id_list',
+            );
         $params['include'] = array(
-        'description'       => __('Limit result set to specific ids.', 'wpem-rest-api'),
-        'type'              => 'array',
-        'items'             => array(
-        'type'          => 'integer',
-        ),
-        'default'           => array(),
-        'sanitize_callback' => 'wp_parse_id_list',
+            'description'       => __( 'Limit result set to specific ids.', 'wpem-rest-api' ),
+            'type'              => 'array',
+            'items'             => array(
+            '   type'          => 'integer',
+            ),
+            'default'           => array(),
+            'sanitize_callback' => 'wp_parse_id_list',
         );
         $params['offset'] = array(
-        'description'        => __('Offset the result set by a specific number of items.', 'wpem-rest-api'),
-        'type'               => 'integer',
-        'sanitize_callback'  => 'absint',
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Offset the result set by a specific number of items.', 'wpem-rest-api' ),
+            'type'               => 'integer',
+            'sanitize_callback'  => 'absint',
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['order'] = array(
-        'description'        => __('Order sort attribute ascending or descending.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'default'            => 'desc',
-        'enum'               => array( 'asc', 'desc' ),
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Order sort attribute ascending or descending.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'default'            => 'desc',
+            'enum'               => array( 'asc', 'desc' ),
+            'validate_callback'  => 'rest_validate_request_arg',
         );
         $params['orderby'] = array(
-        'description'        => __('Sort collection by object attribute.', 'wpem-rest-api'),
-        'type'               => 'string',
-        'default'            => 'date',
-        'enum'               => array(
-        'date',
-        'id',
-        'include',
-        'title',
-        'slug',
-        ),
-        'validate_callback'  => 'rest_validate_request_arg',
+            'description'        => __( 'Sort collection by object attribute.', 'wpem-rest-api' ),
+            'type'               => 'string',
+            'default'            => 'date',
+            'enum'               => array(
+                'date',
+                'id',
+                'include',
+                'title',
+                'slug',
+            ),
+            'validate_callback'  => 'rest_validate_request_arg',
         );
 
-        $post_type_obj = get_post_type_object($this->post_type);
+        $post_type_obj = get_post_type_object( $this->post_type );
 
-        if (isset($post_type_obj->hierarchical) && $post_type_obj->hierarchical ) {
+        if( isset( $post_type_obj->hierarchical ) && $post_type_obj->hierarchical ) {
             $params['parent'] = array(
-            'description'       => __('Limit result set to those of particular parent IDs.', 'wpem-rest-api'),
-            'type'              => 'array',
-            'items'             => array(
-            'type'          => 'integer',
-            ),
-            'sanitize_callback' => 'wp_parse_id_list',
-            'default'           => array(),
+                'description'       => __( 'Limit result set to those of particular parent IDs.', 'wpem-rest-api' ),
+                'type'              => 'array',
+                'items'             => array(
+                    'type'          => 'integer',
+                ),
+                'sanitize_callback' => 'wp_parse_id_list',
+                'default'           => array(),
             );
             $params['parent_exclude'] = array(
-            'description'       => __('Limit result set to all items except those of a particular parent ID.', 'wpem-rest-api'),
-            'type'              => 'array',
-            'items'             => array(
-            'type'          => 'integer',
-            ),
-            'sanitize_callback' => 'wp_parse_id_list',
-            'default'           => array(),
+                'description'       => __( 'Limit result set to all items except those of a particular parent ID.', 'wpem-rest-api' ),
+                'type'              => 'array',
+                'items'             => array(
+                    'type'          => 'integer',
+                ),
+                'sanitize_callback' => 'wp_parse_id_list',
+                'default'           => array(),
             );
         }
 
-        if ('wpem/' === $this->namespace ) {
+        if( 'wpem/' === $this->namespace ) {
             $params['filter'] = array(
-            'type'        => 'object',
-            'description' => __('Use WP Query arguments to modify the response; private query vars require appropriate authorization.', 'wpem-rest-api'),
+                'type'        => 'object',
+                'description' => __( 'Use WP Query arguments to modify the response; private query vars require appropriate authorization.', 'wpem-rest-api' ),
             );
         }
-
         return $params;
     }
 
@@ -742,8 +697,7 @@ public function get_collection_params()
      * @param  WP_REST_Request $request Request object.
      * @return bool|WP_Error
      */
-    protected function update_post_meta_fields( $post, $request )
-    {
+    protected function update_post_meta_fields( $post, $request ) {
         return true;
     }
-}
+}
\ No newline at end of file
diff --git a/includes/rest-api/wpem-rest-venues-controller.php b/includes/rest-api/wpem-rest-venues-controller.php
index c3b8fca..b42081a 100644
--- a/includes/rest-api/wpem-rest-venues-controller.php
+++ b/includes/rest-api/wpem-rest-venues-controller.php
@@ -7,40 +7,35 @@
  * @since 1.0.0
  */
 
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
 /**
  * REST API Events controller class.
  *
  * @extends WPEM_REST_CRUD_Controller
  */
-class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
-{
+class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller {
 
     /**
      * Endpoint namespace.
-     *
      * @var string
      */
     protected $namespace = 'wpem';
 
     /**
      * Route base.
-     *
      * @var string
      */
     protected $rest_base = 'venues';
 
     /**
      * Post type.
-     *
      * @var string
      */
     protected $post_type = 'event_venue';
 
     /**
      * If object is hierarchical.
-     *
      * @var bool
      */
     protected $hierarchical = true;
@@ -48,34 +43,32 @@ class WPEM_REST_Events_Controller extends WPEM_REST_CRUD_Controller
     /**
      * Initialize event actions.
      */
-    public function __construct()
-    {
-        add_action("wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ));
-        add_action('rest_api_init', array( $this, 'register_routes' ), 10);
+    public function __construct() {
+        add_action( "wpem_rest_insert_{$this->post_type}_object", array( $this, 'clear_transients' ) );
+        add_action( 'rest_api_init', array( $this, 'register_routes' ), 10 );
     }
 
     /**
      * Register the routes for events.
      */
-    public function register_routes()
-    {
+    public function register_routes() {
         register_rest_route(
             $this->namespace,
             '/' . $this->rest_base,
             array(
-            array(
-            'methods'             => WP_REST_Server::READABLE,
-            'callback'            => array( $this, 'get_items' ),
-            'permission_callback' => array( $this, 'get_items_permissions_check' ),
-            'args'                => $this->get_collection_params(),
-            ),
-            array(
-                    'methods'             => WP_REST_Server::CREATABLE,
-                    'callback'            => array( $this, 'create_item' ),
-                    'permission_callback' => array( $this, 'create_item_permissions_check' ),
-                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::CREATABLE),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_items' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                    'args'                => $this->get_collection_params(),
+                ),
+                array(
+                        'methods'             => WP_REST_Server::CREATABLE,
+                        'callback'            => array( $this, 'create_item' ),
+                        'permission_callback' => array( $this, 'create_item_permissions_check' ),
+                        'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::CREATABLE),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -83,13 +76,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/(?P<id>[\d]+)',
             array(
-            'args'   => array(
-            'id' => array(
-            'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-            'type'        => 'integer',
+                'args'   => array(
+                    'id' => array(
+                        'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                        'type'        => 'integer',
                     ),
-            ),
-            array(
+                ),
+                array(
                     'methods'             => WP_REST_Server::READABLE,
                     'callback'            => array( $this, 'get_item' ),
                     'permission_callback' => array( $this, 'get_item_permissions_check' ),
@@ -99,27 +92,27 @@ public function register_routes()
                                 'default' => 'view',
                             )
                         ),
-            ),
-            ),
-            array(
+                    ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::EDITABLE,
                     'callback'            => array( $this, 'update_item' ),
                     'permission_callback' => array( $this, 'update_item_permissions_check' ),
-                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            array(
+                    'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+                ),
+                array(
                     'methods'             => WP_REST_Server::DELETABLE,
                     'callback'            => array( $this, 'delete_item' ),
                     'permission_callback' => array( $this, 'delete_item_permissions_check' ),
                     'args'                => array(
                         'force' => array(
                             'default'     => false,
-                            'description' => __('Whether to bypass trash and force deletion.', 'wpem-rest-api'),
+                            'description' => __( 'Whether to bypass trash and force deletion.', 'wpem-rest-api' ),
                             'type'        => 'boolean',
                         ),
-            ),
-            ),
-            'schema' => array( $this, 'get_public_item_schema' ),
+                    ),
+                ),
+                'schema' => array( $this, 'get_public_item_schema' ),
             )
         );
 
@@ -127,13 +120,13 @@ public function register_routes()
             $this->namespace,
             '/' . $this->rest_base . '/batch',
             array(
-            array(
-            'methods'             => WP_REST_Server::EDITABLE,
-            'callback'            => array( $this, 'batch_items' ),
-            'permission_callback' => array( $this, 'batch_items_permissions_check' ),
-            'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
-            ),
-            'schema' => array( $this, 'get_public_batch_schema' ),
+                array(
+                    'methods'             => WP_REST_Server::EDITABLE,
+                    'callback'            => array( $this, 'batch_items' ),
+                    'permission_callback' => array( $this, 'batch_items_permissions_check' ),
+                    'args'                => $this->get_endpoint_args_for_item_schema(WP_REST_Server::EDITABLE),
+                ),
+                'schema' => array( $this, 'get_public_batch_schema' ),
             )
         );
     }
@@ -146,9 +139,8 @@ public function register_routes()
      * @since  3.0.0
      * @return Post Data object
      */
-    protected function get_object( $id )
-    {
-        return get_post($id);
+    protected function get_object( $id ) {
+        return get_post( $id );
     }
 
     /**
@@ -160,15 +152,14 @@ protected function get_object( $id )
      * @since  3.0.0
      * @return WP_REST_Response
      */
-    public function prepare_object_for_response( $object, $request )
-    {
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->get_event_data($object, $context);
+    public function prepare_object_for_response( $object, $request ) {
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->get_event_data( $object, $context );
 
-        $data     = $this->add_additional_fields_to_object($data, $request);
-        $data     = $this->filter_response_by_context($data, $context);
-        $response = rest_ensure_response($data);
-        $response->add_links($this->prepare_links($object, $request));
+        $data     = $this->add_additional_fields_to_object( $data, $request );
+        $data     = $this->filter_response_by_context( $data, $context );
+        $response = rest_ensure_response( $data);
+        $response->add_links( $this->prepare_links( $object, $request ) );
 
         /**
          * Filter the data for a response.
@@ -180,7 +171,7 @@ public function prepare_object_for_response( $object, $request )
          * @param Post Data          $object   Object data.
          * @param WP_REST_Request  $request  Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}_object", $response, $object, $request );
     }
 
     /**
@@ -191,9 +182,8 @@ public function prepare_object_for_response( $object, $request )
      * @since  1.0.0
      * @return array
      */
-    protected function prepare_objects_query( $request )
-    {
-        $args = parent::prepare_objects_query($request);
+    protected function prepare_objects_query( $request ) {
+        $args = parent::prepare_objects_query( $request );
 
         // Set post_status.
         $args['post_status'] = $request['status'];
@@ -204,53 +194,46 @@ protected function prepare_objects_query( $request )
 
         // Map between taxonomy name and arg's key.
         $taxonomies = array(
-        'event_listing_category'            => 'category',
-        'event_listing_type'            => 'type'
+            'event_listing_category' => 'category',
+            'event_listing_type'     => 'type'
         );
 
         // Set tax_query for each passed arg.
-        foreach ( $taxonomies as $taxonomy => $key ) {
-            if (! empty($request[ $key ]) ) {
+        foreach( $taxonomies as $taxonomy => $key ) {
+            if( !empty( $request[ $key ] ) ) {
                 $tax_query[] = array(
-                'taxonomy' => $taxonomy,
-                'field'    => 'term_id',
-                'terms'    => $request[ $key ],
+                    'taxonomy' => $taxonomy,
+                    'field'    => 'term_id',
+                    'terms'    => $request[ $key ],
                 );
             }
         }
 
-
         // Filter by term.
-        if (! empty($tax_query) ) {
+        if( !empty( $tax_query ) ) {
             $args['tax_query'] = $tax_query; // WPCS: slow query ok.
         }
-
         $args['post_type'] = $this->post_type;
-
         return $args;
     }
 
-
     /**
      * Get taxonomy terms.
      *
      * @param Post   $event    as post instance.
      * @param string $taxonomy Taxonomy slug.
-     *
      * @return array
      */
-    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' )
-    {
+    protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_category' ) {
         $terms = array();
 
-        foreach ( get_the_terms($event->ID,  $taxonomy) as $term ) {
+        foreach( get_the_terms( $event->ID,  $taxonomy ) as $term ) {
             $terms[] = array(
-            'id'   => $term->term_id,
-            'name' => $term->name,
-            'slug' => $term->slug,
+                'id'   => $term->term_id,
+                'name' => $term->name,
+                'slug' => $term->slug,
             );
         }
-
         return $terms;
     }
 
@@ -258,36 +241,30 @@ protected function get_taxonomy_terms( $event, $taxonomy = 'event_listing_catego
      * Get the images of an event.
      *
      * @param Post.
-     *
      * @return array
      */
-    protected function get_images( $event )
-    {
+    protected function get_images( $event ) {
         $images         = array();
         $attachment_ids = array();
 
         //get event banner here
-
-
         // Set a placeholder image if the event has no images set.
-        if (empty($images) ) {
+        if( empty( $images ) ) {
             $images[] = array(
-            'id'                => 0,
-            'date_created'      => wpem_rest_api_prepare_date_response(current_time('mysql'), false), // Default to now.
-            'date_created_gmt'  => wpem_rest_api_prepare_date_response(current_time('timestamp', true)), // Default to now.
-            'date_modified'     => wpem_rest_api_prepare_date_response(current_time('mysql'), false),
-            'date_modified_gmt' => wpem_rest_api_prepare_date_response(current_time('timestamp', true)),
-            'src'               => '',
-            'name'              => __('Placeholder', 'wpem-rest-api'),
-            'alt'               => __('Placeholder', 'wpem-rest-api'),
-            'position'          => 0,
+                'id'                => 0,
+                'date_created'      => wpem_rest_api_prepare_date_response( current_time( 'mysql'), false ), // Default to now.
+                'date_created_gmt'  => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ), // Default to now.
+                'date_modified'     => wpem_rest_api_prepare_date_response( current_time( 'mysql'), false ),
+                'date_modified_gmt' => wpem_rest_api_prepare_date_response( current_time( 'timestamp', true ) ),
+                'src'               => '',
+                'name'              => __( 'Placeholder', 'wpem-rest-api' ),
+                'alt'               => __( 'Placeholder', 'wpem-rest-api' ),
+                'position'          => 0,
             );
         }
-
         return $images;
     }
 
-
     /**
      * Get event data.
      *
@@ -295,31 +272,25 @@ protected function get_images( $event )
      * @param string $context Request context.
      *                        Options: 'view'
      *                        and 'edit'.     
-     *
      * @return array
      */
-    protected function get_event_data( $event, $context = 'view' )
-    {
+    protected function get_event_data( $event, $context = 'view' ) {
         $data = array(
-        'id'                    => $event->ID,
-        'name'                  => $event->post_title,
-        'slug'                  => $event->post_name,
-        'permalink'             => get_permalink($event->ID),
-        'date_created'          => get_the_date('', $event),
-        'date_modified'         => get_the_modified_date('', $event),
-        'status'                => $event->post_status,
-        'featured'              => $event->_featured,
-                
-        'description'           => 'view' === $context ? wpautop(do_shortcode(get_event_description($event))) : get_event_description($event),
-                
-        'event_categories'            => taxonomy_exists('event_listing_category') ? get_the_terms($event->ID, 'event_listing_category') : ''   ,
-        'event_types'            => taxonomy_exists('event_listing_type') ? get_the_terms($event->ID, 'event_listing_type') : '',
-        'event_tags'                  => taxonomy_exists('event_listing_tag') ? get_the_terms($event->ID, 'event_listing_tag') : '',
-        'images'                => get_event_banner($event),
-        //'menu_order'            => '',
-        'meta_data'             =>  get_post_meta($event->ID),
+            'id'               => $event->ID,
+            'name'             => $event->post_title,
+            'slug'             => $event->post_name,
+            'permalink'        => get_permalink( $event->ID ),
+            'date_created'     => get_the_date( '', $event ),
+            'date_modified'    => get_the_modified_date( '', $event ),
+            'status'           => $event->post_status,
+            'featured'         => $event->_featured,
+            'description'      => 'view' === $context ? wpautop( do_shortcode( get_event_description( $event ) ) ) : get_event_description( $event ),
+            'event_categories' => taxonomy_exists( 'event_listing_category' ) ? get_the_terms( $event->ID, 'event_listing_category' ) : ''   ,
+            'event_types'      => taxonomy_exists( 'event_listing_type' ) ? get_the_terms( $event->ID, 'event_listing_type' ) : '',
+            'event_tags'       => taxonomy_exists( 'event_listing_tag' ) ? get_the_terms( $event->ID, 'event_listing_tag' ) : '',
+            'images'           => get_event_banner( $event ),
+            'meta_data'        =>  get_post_meta( $event->ID ),
         );
-        
         return $data;
     }
     
@@ -330,19 +301,17 @@ protected function get_event_data( $event, $context = 'view' )
      * @param  WP_REST_Request $request Request object.
      * @return WP_REST_Response
      */
-    public function prepare_item_for_response( $post, $request )
-    {
-        $event = get_post($post);
-        $data    = $this->get_event_data($event);
+    public function prepare_item_for_response( $post, $request ) {
+        $event = get_post( $post );
+        $data    = $this->get_event_data( $event );
         
-        $context = ! empty($request['context']) ? $request['context'] : 'view';
-        $data    = $this->add_additional_fields_to_object($data, $request);
-        $data    = $this->filter_response_by_context($data, $context);
+        $context = !empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
         
         // Wrap the data in a response object.
-        $response = rest_ensure_response($data);
-        
-        $response->add_links($this->prepare_links($event, $request));
+        $response = rest_ensure_response( $data );
+        $response->add_links( $this->prepare_links( $event, $request ) );
         
         /**
          * Filter the data for a response.
@@ -354,7 +323,7 @@ public function prepare_item_for_response( $post, $request )
          * @param WP_Post            $post       Post object.
          * @param WP_REST_Request    $request    Request object.
          */
-        return apply_filters("wpem_rest_prepare_{$this->post_type}", $response, $post, $request);
+        return apply_filters( "wpem_rest_prepare_{$this->post_type}", $response, $post, $request );
     }
 
     /**
@@ -362,26 +331,23 @@ public function prepare_item_for_response( $post, $request )
      *
      * @param post            $object  Object data.
      * @param WP_REST_Request $request Request object.
-     *
      * @return array                   Links for the given post.
      */
-    protected function prepare_links( $object, $request )
-    {
+    protected function prepare_links( $object, $request ) {
         $links = array(
-        'self'       => array(
-       'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
-        ),
-        'collection' => array(
-       'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
-        ),
+            'self'       => array(
+                'href' => rest_url( sprintf( '/%s/%s/%d', $this->namespace, $this->rest_base, $object->ID ) ),  // @codingStandardsIgnoreLine.
+            ),
+            'collection' => array(
+                'href' => rest_url( sprintf( '/%s/%s', $this->namespace, $this->rest_base ) ),  // @codingStandardsIgnoreLine.
+            ),
         );
 
-        if ($object->post_parent  ) {
+        if( $object->post_parent  ) {
             $links['up'] = array(
-          'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent  ) ),  // @codingStandardsIgnoreLine.
+                'href' => rest_url( sprintf( '/%s/events/%d', $this->namespace, $object->post_parent  ) ),  // @codingStandardsIgnoreLine.
             );
         }
-
         return $links;
     }
 
@@ -390,32 +356,28 @@ protected function prepare_links( $object, $request )
      *
      * @param WP_REST_Request $request  Request object.
      * @param bool            $creating If is creating a new object.
-     *
      * @return WP_Error | Post
      */
-    protected function prepare_object_for_database( $request, $creating = false )
-    {
-        $id = isset($request['id']) ? absint($request['id']) : 0;
+    protected function prepare_object_for_database( $request, $creating = false ) {
+        $id = isset( $request['id'] ) ? absint( $request['id'] ) : 0;
 
-        if (isset($request['id']) ) {
-            $event = get_post($id);
-        }
-        else{
-            if(!empty($request['event_title']) && isset($request['event_id'])  && $request['event_id'] == 0 ) {
+        if( isset( $request['id'] ) ) {
+            $event = get_post( $id );
+        } else {
+            if( !empty( $request['event_title'] ) && isset( $request['event_id'] )  && $request['event_id'] == 0 ) {
                 $_POST = $request;
 
                 //we are inserting new event means if there is any already created event cookies we need to remvoe it
-                if(isset($_COOKIE['wp-event-manager-submitting-event-id']) ) {
-                       unset($_COOKIE['wp-event-manager-submitting-event-id']);
+                if( isset( $_COOKIE['wp-event-manager-submitting-event-id'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-id'] );
                 }                
-                if(isset($_COOKIE['wp-event-manager-submitting-event-key']) ) {
-                        unset($_COOKIE['wp-event-manager-submitting-event-key']);
+                if( isset($_COOKIE['wp-event-manager-submitting-event-key'] ) ) {
+                    unset( $_COOKIE['wp-event-manager-submitting-event-key'] );
                 }
 
-
-                $GLOBALS['event_manager']->forms->get_form('submit-event', array());
-                $form_submit_event_instance = call_user_func(array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ));
-                $event_fields =    $form_submit_event_instance->merge_with_custom_fields('frontend');
+                $GLOBALS['event_manager']->forms->get_form( 'submit-event', array() );
+                $form_submit_event_instance = call_user_func( array( 'WP_Event_Manager_Form_Submit_Event', 'instance' ) );
+                $event_fields = $form_submit_event_instance->merge_with_custom_fields( 'frontend' );
 
                 //submit current event with $_POST values
                 $form_submit_event_instance ->submit_handler();
@@ -425,20 +387,17 @@ protected function prepare_object_for_database( $request, $creating = false )
                 $form_submit_event_instance->preview_handler();
 
                 //we don't need done status it will be managed by response of the current request
-                if(!$form_submit_event_instance->get_event_id() ) {
-
-                     $validation_errors =  $this->get_errors();
+                if( !$form_submit_event_instance->get_event_id() ) {
+                    $validation_errors =  $this->get_errors();
                     foreach ( $validation_errors as $error ) {
-                        echo  esc_html__($error);
+                        echo esc_html__( $error );
                     }
                     return;
                 }
-                $event = get_post($form_submit_event_instance->get_event_id());
-            }
-            else{
+                $event = get_post( $form_submit_event_instance->get_event_id() );
+            } else {
                 return;
             }
-
         }
 
         /**
@@ -451,7 +410,7 @@ protected function prepare_object_for_database( $request, $creating = false )
          * @param WP_REST_Request $request  Request object.
          * @param bool            $creating If is creating a new object.
          */
-        return apply_filters("wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating);
+        return apply_filters( "wpem_rest_pre_insert_{$this->post_type}_object", $event, $request, $creating );
     }
 
     /**
@@ -459,79 +418,75 @@ protected function prepare_object_for_database( $request, $creating = false )
      *
      * @param $event  Event instance.
      * @param array $images Images data.
-     *
      * @throws WC_REST_Exception REST API exceptions.
      * @return $event object
      */
-    protected function set_event_images( $event, $images )
-    {
-        $images = is_array($images) ? array_filter($images) : array();
+    protected function set_event_images( $event, $images ) {
+        $images = is_array( $images ) ? array_filter( $images ) : array();
 
-        if (! empty($images) ) {
+        if( !empty( $images ) ) {
             $gallery_positions = array();
 
-            foreach ( $images as $index => $image ) {
-                $attachment_id = isset($image['id']) ? absint($image['id']) : 0;
+            foreach( $images as $index => $image ) {
+                $attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
 
-                if (0 === $attachment_id && isset($image['src']) ) {
-                    $upload = wpem_rest_upload_image_from_url(esc_url_raw($image['src']));
+                if( 0 === $attachment_id && isset( $image['src'] ) ) {
+                    $upload = wpem_rest_upload_image_from_url( esc_url_raw( $image['src'] ) );
 
-                    if (is_wp_error($upload) ) {
-                        if (! apply_filters('wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images) ) {
-                            throw new Exception('wpem_event_image_upload_error', $upload->get_error_message(), 400);
+                    if( is_wp_error( $upload ) ) {
+                        if( !apply_filters( 'wpem_rest_suppress_image_upload_error', false, $upload, $event->get_id(), $images ) ) {
+                            throw new Exception( 'wpem_event_image_upload_error', $upload->get_error_message(), 400 );
                         } else {
                             continue;
                         }
                     }
-
-                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment($upload, $event->ID);
+                    $attachment_id = wpem_rest_set_uploaded_image_as_attachment( $upload, $event->ID );
                 }
 
-                if (! wp_attachment_is_image($attachment_id) ) {
+                if( !wp_attachment_is_image( $attachment_id ) ) {
                     /* translators: %s: attachment id */
-                    throw new Exception('wpem_event_invalid_image_id', sprintf(__('#%s is an invalid image ID.', 'wpem-rest-api'), $attachment_id), 400);
+                    throw new Exception( 'wpem_event_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'wpem-rest-api' ), $attachment_id ), 400 );
                 }
 
-                $gallery_positions[ $attachment_id ] = absint(isset($image['position']) ? $image['position'] : $index);
+                $gallery_positions[ $attachment_id ] = absint(isset( $image['position'] ) ? $image['position'] : $index );
 
                 // Set the image alt if present.
-                if (! empty($image['alt']) ) {
-                    update_post_meta($attachment_id, '_wp_attachment_image_alt', wc_clean($image['alt']));
+                if( !empty( $image['alt'] ) ) {
+                    update_post_meta( $attachment_id, '_wp_attachment_image_alt', wc_clean( $image['alt'] ) );
                 }
 
                 // Set the image name if present.
-                if (! empty($image['name']) ) {
+                if( !empty( $image['name'] ) ) {
                     wp_update_post(
                         array(
-                        'ID'         => $attachment_id,
-                        'post_title' => $image['name'],
+                            'ID'         => $attachment_id,
+                            'post_title' => $image['name'],
                         )
                     );
                 }
 
                 // Set the image source if present, for future reference.
-                if (! empty($image['src']) ) {
-                    update_post_meta($attachment_id, '_wpem_attachment_source', esc_url_raw($image['src']));
+                if( !empty( $image['src'] ) ) {
+                    update_post_meta( $attachment_id, '_wpem_attachment_source', esc_url_raw( $image['src'] ) );
                 }
             }
 
             // Sort images and get IDs in correct order.
-            asort($gallery_positions);
+            asort( $gallery_positions );
 
             // Get gallery in correct order.
-            $gallery = array_keys($gallery_positions);
+            $gallery = array_keys( $gallery_positions );
 
             // Featured image is in position 0.
-            $image_id = array_shift($gallery);
+            $image_id = array_shift( $gallery );
 
             // Set images.
-            $event->set_image_id($image_id);
-            $event->set_gallery_image_ids($gallery);
+            $event->set_image_id( $image_id );
+            $event->set_gallery_image_ids( $gallery );
         } else {
-            $event->set_image_id('');
-            $event->set_gallery_image_ids(array());
+            $event->set_image_id( '' );
+            $event->set_gallery_image_ids( array() );
         }
-
         return $event;
     }
 
@@ -542,33 +497,27 @@ protected function set_event_images( $event, $images )
      * @param Event  $event    instance.
      * @param array  $terms    Terms data.
      * @param string $taxonomy Taxonomy name.
-     *
      * @return Event object
      */
-    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' )
-    {
-        $term_ids = wp_list_pluck($terms, 'id');
+    protected function save_taxonomy_terms( $event, $terms, $taxonomy = 'cat' ) {
+        $term_ids = wp_list_pluck( $terms, 'id' );
 
-        if ('event_listing_category' === $taxonomy ) {
+        if( 'event_listing_category' === $taxonomy ) {
             $event->set_category_ids($term_ids);
-        } elseif ('event_listing_type' === $taxonomy ) {
-            $event->set_type_ids($term_ids);
-        } elseif ('tag' === $taxonomy ) {
-            $event->set_tag_ids($term_ids);
+        } elseif( 'event_listing_type' === $taxonomy ) {
+            $event->set_type_ids( $term_ids );
+        } elseif( 'tag' === $taxonomy ) {
+            $event->set_tag_ids( term_ids );
         }
-
         return $event;
     }
 
-    
-
     /**
      * Clear caches here so in sync with any new variations/children.
      *
      * @param WC_Data $object Object data.
      */
-    public function clear_transients( $object )
-    {
+    public function clear_transients( $object ) {
         //call wpem clear transient here
     }
 
@@ -576,29 +525,23 @@ public function clear_transients( $object )
      * Delete a single item.
      *
      * @param WP_REST_Request $request Full details about the request.
-     *
      * @return WP_REST_Response|WP_Error
      */
-    public function delete_item( $request )
-    {
+    public function delete_item( $request ) {
         $id     = (int) $request['id'];
         $force  = (bool) $request['force'];
         $object = $this->get_object((int) $request['id']);
         $result = false;
-
-        if (! $object || 0 === $object->ID ) {
+        if( !$object || 0 === $object->ID ) {
             return new WP_Error(
                 "wpem_rest_{$this->post_type}_invalid_id",
-                __('Invalid ID.', 'wpem-rest-api'),
+                __( 'Invalid ID.', 'wpem-rest-api' ),
                 array(
-                'status' => 404,
+                    'status' => 404,
                 )
             );
         }
-
-        
-
-        $supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable(array( $object, 'get_status' ));
+        $supports_trash = EMPTY_TRASH_DAYS > 0 && is_callable( array( $object, 'get_status' ) );
 
         /**
          * Filter whether an object is trashable.
@@ -608,77 +551,66 @@ public function delete_item( $request )
          * @param boolean $supports_trash Whether the object type support trashing.
          * @param WC_Data $object         The object being considered for trashing support.
          */
-        $supports_trash = apply_filters("wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object);
+        $supports_trash = apply_filters( "wpem_rest_{$this->post_type}_object_trashable", $supports_trash, $object );
 
-        if (! wpem_rest_api_check_post_permissions($this->post_type, 'delete', $object->ID) ) {
+        if( !wpem_rest_api_check_post_permissions( $this->post_type, 'delete', $object->ID ) ) {
             return new WP_Error(
                 "wpem_rest_user_cannot_delete_{$this->post_type}",
                 /* translators: %s: post type */
-                sprintf(__('Sorry, you are not allowed to delete %s.', 'wpem-rest-api'), $this->post_type),
+                sprintf( __( 'Sorry, you are not allowed to delete %s.', 'wpem-rest-api' ), $this->post_type ),
                 array(
-                'status' => rest_authorization_required_code(),
+                    'status' => rest_authorization_required_code(),
                 )
             );
         }
 
-        $request->set_param('context', 'edit');
-        $response = $this->prepare_object_for_response($object, $request);
+        $request->set_param( 'context', 'edit' );
+        $response = $this->prepare_object_for_response( $object, $request );
 
         // If we're forcing, then delete permanently.
-        if ($force ) {    
-
-            wp_delete_post($object->ID, true);
-            //$result = 0 === $object->ID;
+        if( $force ) {    
+            wp_delete_post( $object->ID, true );
             $result = 1;
         } else {
             // If we don't support trashing for this type, error out.
-            if (! $supports_trash ) {
+            if( !$supports_trash ) {
                 return new WP_Error(
                     'wpem_rest_trash_not_supported',
                     /* translators: %s: post type */
-                    sprintf(__('The %s does not support trashing.', 'wpem-rest-api'), $this->post_type),
+                    sprintf( __( 'The %s does not support trashing.', 'wpem-rest-api' ), $this->post_type ),
                     array(
-                    'status' => 501,
+                        'status' => 501,
                     )
                 );
             }
 
             // Otherwise, only trash if we haven't already.
-            if (is_callable(array( $object, 'get_status' )) ) {
-                if ('trash' === $object->get_status() ) {
+            if( is_callable( array( $object, 'get_status' ) ) ) {
+                if( 'trash' === $object->get_status() ) {
                     return new WP_Error(
                         'wpem_rest_already_trashed',
                         /* translators: %s: post type */
-                        sprintf(__('The %s has already been deleted.', 'wpem-rest-api'), $this->post_type),
+                        sprintf( __( 'The %s has already been deleted.', 'wpem-rest-api' ), $this->post_type ),
                         array(
-                        'status' => 410,
+                            'status' => 410,
                         )
                     );
                 }
-
-                wp_delete_post($object->ID);
+                wp_delete_post( $object->ID );
                 $result = 'trash' === $object->get_status();
             }
         }
-
-        if (! $result ) {
+        if( !$result ) {
             return new WP_Error(
                 'wpem_rest_cannot_delete',
                 /* translators: %s: post type */
-                sprintf(__('The %s cannot be deleted.', 'wpem-rest-api'), $this->post_type),
+                sprintf( __( 'The %s cannot be deleted.', 'wpem-rest-api' ), $this->post_type ),
                 array(
-                'status' => 500,
+                 'status' => 500,
                 )
             );
         }
 
-        /*
-        // Delete parent event transients.
-        if ( 0 !== $object->get_parent_id() ) {
-        wpem_delete_event_transients( $object->get_parent_id() );
-        }
-        */
-
         /**
          * Fires after a single object is deleted or trashed via the REST API.
          *
@@ -686,7 +618,7 @@ public function delete_item( $request )
          * @param WP_REST_Response $response The response data.
          * @param WP_REST_Request  $request  The request sent to the API.
          */
-        do_action("wpem_rest_delete_{$this->post_type}_object", $object, $response, $request);
+        do_action( "wpem_rest_delete_{$this->post_type}_object", $object, $response, $request );
 
         return $response;
     }
@@ -696,279 +628,270 @@ public function delete_item( $request )
      *
      * @return array
      */
-    public function get_item_schema()
-    {
-        $weight_unit    = get_option('wpem_weight_unit');
-        $dimension_unit = get_option('wpem_dimension_unit');
+    public function get_item_schema() {
+        $weight_unit    = get_option( 'wpem_weight_unit' );
+        $dimension_unit = get_option( 'wpem_dimension_unit' );
         $schema         = array(
-        '$schema'    => 'http://json-schema.org/draft-04/schema#',
-        'title'      => $this->post_type,
-        'type'       => 'object',
-        'properties' => array(
-        'id'                    => array(
-        'description' => __('Unique identifier for the resource.', 'wpem-rest-api'),
-        'type'        => 'integer',
-        'context'     => array( 'view', 'edit' ),
-        'readonly'    => true,
-        ),
-        'name'                  => array(
-                    'description' => __('Event name.', 'wpem-rest-api'),
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+            'properties' => array(
+                'id' => array(
+                    'description' => __( 'Unique identifier for the resource.', 'wpem-rest-api' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+                'name' => array(
+                    'description' => __( 'Event name.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'slug'                  => array(
-                    'description' => __('event slug.', 'wpem-rest-api'),
+                ),
+                'slug' => array(
+                    'description' => __( 'event slug.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'permalink'             => array(
-                    'description' => __('event URL.', 'wpem-rest-api'),
+                ),
+                'permalink' => array(
+                    'description' => __( 'event URL.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'format'      => 'uri',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created'          => array(
-                    'description' => __("The date the event was created, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_created' => array(
+                    'description' => __( "The date the event was created, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_created_gmt'      => array(
-                    'description' => __('The date the event was created, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_created_gmt' => array(
+                    'description' => __( 'The date the event was created, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified'         => array(
-                    'description' => __("The date the event was last modified, in the site's timezone.", 'wpem-rest-api'),
+                ),
+                'date_modified' => array(
+                    'description' => __( "The date the event was last modified, in the site's timezone.", 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-        'date_modified_gmt'     => array(
-                    'description' => __('The date the event was last modified, as GMT.', 'wpem-rest-api'),
+                ),
+                'date_modified_gmt' => array(
+                    'description' => __( 'The date the event was last modified, as GMT.', 'wpem-rest-api' ),
                     'type'        => 'date-time',
                     'context'     => array( 'view', 'edit' ),
                     'readonly'    => true,
-        ),
-            
-        'status'                => array(
-                    'description' => __('Event status (post status).', 'wpem-rest-api'),
+                ),
+                'status' => array(
+                    'description' => __( 'Event status (post status).', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'default'     => 'publish',
                     'enum'        => array_merge(array_keys(get_post_statuses()), array( 'future' )),
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'featured'              => array(
-                    'description' => __('Featured event.', 'wpem-rest-api'),
+                ),
+                'featured' => array(
+                    'description' => __( 'Featured event.', 'wpem-rest-api' ),
                     'type'        => 'boolean',
                     'default'     => false,
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'description'           => array(
-                    'description' => __('Event description.', 'wpem-rest-api'),
+                ),
+                'description' => array(
+                    'description' => __( 'Event description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-        'short_description'     => array(
-                    'description' => __('Event short description.', 'wpem-rest-api'),
+                ),
+                'short_description' => array(
+                    'description' => __( 'Event short description.', 'wpem-rest-api' ),
                     'type'        => 'string',
                     'context'     => array( 'view', 'edit' ),
-        ),
-                
-        'categories'            => array(
-                    'description' => __('List of categories.', 'wpem-rest-api'),
+                ),
+                'categories' => array(
+                    'description' => __( 'List of categories.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'   => array(
-                                'description' => __('Category ID.', 'wpem-rest-api'),
+                                'description' => __( 'Category ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Category name.', 'wpem-rest-api'),
+                                'description' => __( 'Category name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Category slug.', 'wpem-rest-api'),
+                                'description' => __( 'Category slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'tags'                  => array(
-                    'description' => __('List of tags.', 'wpem-rest-api'),
+                    ),
+                ),
+                'tags' => array(
+                    'description' => __( 'List of tags.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'   => array(
-                                'description' => __('Tag ID.', 'wpem-rest-api'),
+                                'description' => __( 'Tag ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name' => array(
-                                'description' => __('Tag name.', 'wpem-rest-api'),
+                                'description' => __( 'Tag name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'slug' => array(
-                                'description' => __('Tag slug.', 'wpem-rest-api'),
+                                'description' => __( 'Tag slug.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                         ),
-        ),
-        ),
-        'images'                => array(
-                    'description' => __('List of images.', 'wpem-rest-api'),
+                    ),
+                ),
+                'images' => array(
+                    'description' => __( 'List of images.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'                => array(
-                                'description' => __('Image ID.', 'wpem-rest-api'),
+                                'description' => __( 'Image ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'date_created'      => array(
-                                'description' => __("The date the image was created, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was created, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_created_gmt'  => array(
-                                'description' => __('The date the image was created, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was created, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified'     => array(
-                                'description' => __("The date the image was last modified, in the site's timezone.", 'wpem-rest-api'),
+                                'description' => __( "The date the image was last modified, in the site's timezone.", 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'date_modified_gmt' => array(
-                                'description' => __('The date the image was last modified, as GMT.', 'wpem-rest-api'),
+                                'description' => __( 'The date the image was last modified, as GMT.', 'wpem-rest-api' ),
                                 'type'        => 'date-time',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'src'               => array(
-                                'description' => __('Image URL.', 'wpem-rest-api'),
+                                'description' => __( 'Image URL.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'format'      => 'uri',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'name'              => array(
-                                'description' => __('Image name.', 'wpem-rest-api'),
+                                'description' => __( 'Image name.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'alt'               => array(
-                                'description' => __('Image alternative text.', 'wpem-rest-api'),
+                                'description' => __( 'Image alternative text.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'position'          => array(
-                                'description' => __('Image position. 0 means that the image is featured.', 'wpem-rest-api'),
+                                'description' => __( 'Image position. 0 means that the image is featured.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-                
-        'meta_data'             => array(
-                    'description' => __('Meta data.', 'wpem-rest-api'),
+                    ),
+                ),
+                'meta_data' => array(
+                    'description' => __( 'Meta data.', 'wpem-rest-api' ),
                     'type'        => 'array',
                     'context'     => array( 'view', 'edit' ),
                     'items'       => array(
                         'type'       => 'object',
                         'properties' => array(
                             'id'    => array(
-                                'description' => __('Meta ID.', 'wpem-rest-api'),
+                                'description' => __( 'Meta ID.', 'wpem-rest-api' ),
                                 'type'        => 'integer',
                                 'context'     => array( 'view', 'edit' ),
                                 'readonly'    => true,
                             ),
                             'key'   => array(
-                                'description' => __('Meta key.', 'wpem-rest-api'),
+                                'description' => __( 'Meta key.', 'wpem-rest-api' ),
                                 'type'        => 'string',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                             'value' => array(
-                                'description' => __('Meta value.', 'wpem-rest-api'),
+                                'description' => __( 'Meta value.', 'wpem-rest-api' ),
                                 'type'        => 'mixed',
                                 'context'     => array( 'view', 'edit' ),
                             ),
                         ),
-        ),
-        ),
-        ),
+                    ),
+                ),
+            ),
         );
-
-        return $this->add_additional_fields_schema($schema);
+        return $this->add_additional_fields_schema( $schema );
     }
 
     /**
      * Get the query params for collections of attachments.
-     *
      * @return array
      */
-    public function get_collection_params()
-    {
+    public function get_collection_params() {
         $params = parent::get_collection_params();
 
-        $params['orderby']['enum'] = array_merge($params['orderby']['enum'], array( 'menu_order' ));
+        $params['orderby']['enum'] = array_merge( $params['orderby']['enum'], array( 'menu_order' ) );
 
         $params['slug']           = array(
-        'description'       => __('Limit result set to events with a specific slug.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'validate_callback' => 'rest_validate_request_arg',
+            'description'       => __( 'Limit result set to events with a specific slug.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'validate_callback' => 'rest_validate_request_arg',
         );
         $params['status']         = array(
-        'default'           => 'any',
-        'description'       => __('Limit result set to events assigned a specific status.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'enum'              => array_merge(array( 'any', 'future' ), array_keys(get_post_statuses())),
-        'sanitize_callback' => 'sanitize_key',
-        'validate_callback' => 'rest_validate_request_arg',
+            'default'           => 'any',
+            'description'       => __( 'Limit result set to events assigned a specific status.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'enum'              => array_merge( array( 'any', 'future' ), array_keys( get_post_statuses() ) ),
+            'sanitize_callback' => 'sanitize_key',
+            'validate_callback' => 'rest_validate_request_arg',
         );
     
         $params['featured']       = array(
-        'description'       => __('Limit result set to featured events.', 'wpem-rest-api'),
-        'type'              => 'boolean',
-        'sanitize_callback' => 'wc_string_to_bool',
-        'validate_callback' => 'rest_validate_request_arg',
+            'description'       => __( 'Limit result set to featured events.', 'wpem-rest-api' ),
+            'type'              => 'boolean',
+            'sanitize_callback' => 'wc_string_to_bool',
+            'validate_callback' => 'rest_validate_request_arg',
         );
         $params['category']       = array(
-        'description'       => __('Limit result set to events assigned a specific category ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+            'description'       => __( 'Limit result set to events assigned a specific category ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
         $params['tag']            = array(
-        'description'       => __('Limit result set to events assigned a specific tag ID.', 'wpem-rest-api'),
-        'type'              => 'string',
-        'sanitize_callback' => 'wp_parse_id_list',
-        'validate_callback' => 'rest_validate_request_arg',
+            'description'       => __( 'Limit result set to events assigned a specific tag ID.', 'wpem-rest-api' ),
+            'type'              => 'string',
+            'sanitize_callback' => 'wp_parse_id_list',
+            'validate_callback' => 'rest_validate_request_arg',
         );
-        
-
         return $params;
     }
     
@@ -977,12 +900,7 @@ public function get_collection_params()
      *
      * @return array
      */
-    public function check_event_permissions($request)
-    {
-        
-    }
-    
+    public function check_event_permissions($request) { }
 }
 
-
-new WPEM_REST_Events_Controller();
+new WPEM_REST_Events_Controller();
\ No newline at end of file
diff --git a/includes/wpem-rest-api-dashboard.php b/includes/wpem-rest-api-dashboard.php
index de11581..3894328 100644
--- a/includes/wpem-rest-api-dashboard.php
+++ b/includes/wpem-rest-api-dashboard.php
@@ -1,23 +1,18 @@
 <?php
-if (! defined('ABSPATH') ) {
+if( !defined( 'ABSPATH' ) ) {
     exit;
 }
 
 /**
- * WPEM_Rest_API_Dashboard class.
+ * WPEM_Rest_API_Dashboard class to show rest api data at front-end.
  */
-class WPEM_Rest_API_Dashboard
-{
+class WPEM_Rest_API_Dashboard {
 
     /**
      * __construct function.
      */
     public function __construct()
-    {
-
-        /*add_filter( 'wpem_dashboard_menu', array($this,'wpem_dashboard_menu_add') );
-        add_action( 'event_manager_event_dashboard_content_wpem_rest_api_setting', array( $this, 'wpem_rest_api_output_setting' ) );*/
-    }
+    {  }
 
     /**
      * add dashboard menu function.
@@ -25,18 +20,17 @@ public function __construct()
      * @access public
      * @return void
      */
-    public function wpem_dashboard_menu_add($menus) 
-    {
+    public function wpem_dashboard_menu_add( $menus ) {
         $menus['rest_api'] = [
-         'title' => __('Rest API', 'wpem-rest-api'),
-         'icon' => 'wpem-icon-loop',
-         'submenu' => [
-          'wpem_rest_api_setting' => [
-                                'title' => __('Settings', 'wpem-rest-api'),
-                                'query_arg' => ['action' => 'wpem_rest_api_setting'],
-          ],
-         ]
-                    ];
+            'title'   => __( 'Rest API', 'wpem-rest-api' ),
+            'icon'    => 'wpem-icon-loop',
+            'submenu' => [
+                'wpem_rest_api_setting' => [
+                    'title' => __( 'Settings', 'wpem-rest-api' ),
+                    'query_arg' => [ 'action' => 'wpem_rest_api_setting' ],
+                ],
+            ]
+        ];
         return $menus;
     }
 
@@ -46,14 +40,11 @@ public function wpem_dashboard_menu_add($menus)
      * @access public
      * @return void
      */
-    public function wpem_rest_api_output_setting()
-    {
+    public function wpem_rest_api_output_setting() {
         get_event_manager_template( 
             'wpem-dashboard-rest-api-settings.php', array(), 'wpem-rest-api', 
             WPEM_REST_API_PLUGIN_DIR . '/templates/' 
         );
-
     }
-
 }
-new WPEM_Rest_API_Dashboard();
+new WPEM_Rest_API_Dashboard();
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index edbe43e..76a63b5 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,8 @@ Contributors: wpeventmanager,ashokdudhat,krinay
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=55FRYATTFLA5N
 Tags: event manager, Event, events, event manager api , listings
 Requires at least: 4.1
-Tested up to: 5.9
-Stable tag: 1.0.3
+Tested up to: 6.2.2
+Stable tag: 1.0.4
 Requires PHP: 5.6
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -119,6 +119,15 @@ If you wish to be notified of new postings on your site you can use a plugin suc
 
 == Changelog ==
 
+= 1.0.4 [ 17th Oct 2023 ] =
+
+Fixed : Description is added for REST API addon.
+Fixed : Repeated Ajax requests sending while selecting a color issue is fixed.
+Fixed : Display the save message while saving App Branding.
+Fixed : Show the notice in proper alignment.
+Added : A copied key button is added on the key generate page.
+Added : Application name feature added to the add-on.
+
 = 1.0.3 [ 22nd Dec 2022 ] =
 
 Fixed - Event Ticket scaning issue with mobile app.
diff --git a/uninstall.php b/uninstall.php
index ebe0c18..a786a59 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -1,8 +1,9 @@
 <?php
-if (!defined( 'WP_UNINSTALL_PLUGIN')) {
+if( !defined( 'WP_UNINSTALL_PLUGIN' ) ) {
 	exit();
 }
 
+// Delete options of rest api plugin
 $options = array(
 	'wpem_rest_api_version',
 	'wpem_primary_color',
@@ -17,8 +18,10 @@
 	'wpem_danger_dark_color',
 	'wpem_app_branding_settings',
 	'wpem_app_branding_dark_settings',
+	'wpem_rest_api_app_logo',
+	'wpem_rest_api_app_name'
 );
 
-foreach ($options as $option) {
-	delete_option($option);
-}
+foreach ( $options as $option ) {
+	delete_option( $option );
+}
\ No newline at end of file
diff --git a/wpem-rest-api-functions.php b/wpem-rest-api-functions.php
index 9a35cec..0c4c39a 100644
--- a/wpem-rest-api-functions.php
+++ b/wpem-rest-api-functions.php
@@ -1,12 +1,11 @@
 <?php
 /**
- * WPEM Functions
- *
+ * WPEM Rest Api public functions
  * @version 1.0.0
  */
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
-if(!function_exists('wpem_rest_api_prepare_date_response')) {
+if( !function_exists( 'wpem_rest_api_prepare_date_response' ) ) {
     /**
      * Parses and formats a date for ISO8601/RFC3339.
      *
@@ -18,14 +17,13 @@
      * @param  bool         $utc  Send false to get local/offset time.
      * @return string|null ISO8601/RFC3339 formatted datetime.
      */
-    function wpem_rest_api_prepare_date_response( $date, $utc = true )
-    {
+    function wpem_rest_api_prepare_date_response( $date, $utc = true ) {
         //need improvements as per wpem date time class
         return $date;
     }
 }
 
-if(!function_exists('wpem_rest_api_check_post_permissions')) {
+if( !function_exists( 'wpem_rest_api_check_post_permissions' ) ) {
     /**
      * Check permissions of posts on REST API.
      *
@@ -38,19 +36,19 @@ function wpem_rest_api_prepare_date_response( $date, $utc = true )
     function wpem_rest_api_check_post_permissions( $post_type, $context = 'read', $object_id = 0 ) {
         global $wpdb;
         $contexts = array(
-        'read'   => 'read',
-        'create' => 'publish_posts',
-        'edit'   => 'edit_post',
-        'delete' => 'delete_post',
-        'batch'  => 'edit_others_posts',
+            'read'   => 'read',
+            'create' => 'publish_posts',
+            'edit'   => 'edit_post',
+            'delete' => 'delete_post',
+            'batch'  => 'edit_others_posts',
         );
         $permission = true;       
 
-        return apply_filters('wpem_rest_api_check_permissions', $permission, $context, $object_id, $post_type);
+        return apply_filters( 'wpem_rest_api_check_permissions', $permission, $context, $object_id, $post_type );
     }
 }
 
-if(!function_exists('wpem_rest_api_urlencode_rfc3986')) {
+if( !function_exists( 'wpem_rest_api_urlencode_rfc3986' ) ) {
     /**
      * Encodes a value according to RFC 3986.
      * Supports multidimensional arrays.
@@ -60,15 +58,15 @@ function wpem_rest_api_check_post_permissions( $post_type, $context = 'read', $o
      * @return string|array       Encoded values.
      */
     function wpem_rest_api_urlencode_rfc3986( $value ){
-        if (is_array($value) ) {
+        if ( is_array( $value ) ) {
             return array_map('wpem_rest_api_urlencode_rfc3986', $value);
         }
 
-        return str_replace(array( '+', '%7E' ), array( ' ', '~' ), rawurlencode($value));
+        return str_replace( array( '+', '%7E' ), array( ' ', '~' ), rawurlencode( $value ) );
     }
 }
 
-if(!function_exists('wpem_rest_api_color_brightness')) {
+if( !function_exists( 'wpem_rest_api_color_brightness' ) ) {
 
     /**
      * WPEM Color Brightness
@@ -77,27 +75,27 @@ function wpem_rest_api_urlencode_rfc3986( $value ){
      * @param  string $data Message to be hashed.
      * @return string
      */
-    function wpem_rest_api_color_brightness($hexCode, $adjustPercent){
-        $hexCode = ltrim($hexCode, '#');
+    function wpem_rest_api_color_brightness( $hexCode, $adjustPercent ){
+        $hexCode = ltrim( $hexCode, '#' );
 
-        if (strlen($hexCode) == 3) {
+        if ( strlen( $hexCode ) == 3 ) {
             $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
         }
 
-        $hexCode = array_map('hexdec', str_split($hexCode, 2));
+        $hexCode = array_map( 'hexdec', str_split( $hexCode, 2 ) );
 
-        foreach ($hexCode as & $color) {
+        foreach ( $hexCode as & $color ) {
             $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-            $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+            $adjustAmount = ceil( $adjustableLimit * $adjustPercent );
 
-            $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            $color = str_pad(dechex( $color + $adjustAmount ), 2, '0', STR_PAD_LEFT );
         }
 
-        return '#' . implode($hexCode);
+        return '#' . implode( $hexCode );
     }
 }
 
-if(!function_exists('wpem_rest_api_hex_to_rgb')) {
+if( !function_exists( 'wpem_rest_api_hex_to_rgb' ) ) {
     /**
      * WPEM hex to rgb
      *
@@ -109,20 +107,20 @@ function wpem_rest_api_hex_to_rgb( $colour ){
         if ($colour[0] == '#' ) {
             $colour = substr($colour, 1);
         }
-        if (strlen($colour) == 6 ) {
+        if ( strlen($colour) == 6 ) {
             list( $r, $g, $b ) = array( $colour[0] . $colour[1], $colour[2] . $colour[3], $colour[4] . $colour[5] );
-        } elseif (strlen($colour) == 3 ) {
+        } elseif ( strlen($colour ) == 3 ) {
             list( $r, $g, $b ) = array( $colour[0] . $colour[0], $colour[1] . $colour[1], $colour[2] . $colour[2] );
         } else {
             return false;
         }
-        $r = hexdec($r);
-        $g = hexdec($g);
-        $b = hexdec($b);
+        $r = hexdec( $r );
+        $g = hexdec( $g );
+        $b = hexdec( $b );
         return array( 'red' => $r, 'green' => $g, 'blue' => $b );
     }
 }
-if(!function_exists('wpem_rest_api_check_manager_permissions')) {
+if( !function_exists( 'wpem_rest_api_check_manager_permissions' ) ) {
     /**
      * Check manager permissions on REST API.
      *
@@ -134,6 +132,6 @@ function wpem_rest_api_hex_to_rgb( $colour ){
     function wpem_rest_api_check_manager_permissions( $object, $context = 'read' ){
         $permission = true;
 
-        return apply_filters('wpem_rest_api_check_permissions', $permission, $context, 0, $object);
+        return apply_filters( 'wpem_rest_api_check_permissions', $permission, $context, 0, $object );
     }
-}
+}
\ No newline at end of file
diff --git a/wpem-rest-api.php b/wpem-rest-api.php
index 011727d..389e73c 100644
--- a/wpem-rest-api.php
+++ b/wpem-rest-api.php
@@ -1,18 +1,18 @@
 <?php
-/*
+/**
 * Plugin Name: WPEM - REST API
 * Plugin URI: http://www.wp-eventmanager.com/plugins/
 * 
-* Description: WP Event Manager rest API.
+* Description: Lets users connect the Mobile application with their WordPress events website.
 * Author: WP Event Manager
 * Author URI: http://www.wp-eventmanager.com
 * 
 * Text Domain: wpem-rest-api
 * Domain Path: /languages
-* Version: 1.0.3
+* Version: 1.0.4
 * Since: 1.0.0
 * 
-* Requires WordPress Version at least: 4.1
+* Requires WordPress Version at least: 5.6
 * Copyright: 2019 WP Event Manager
 * License: GNU General Public License v3.0
 * License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -20,12 +20,11 @@
 */
 
 // Exit if accessed directly
-if (! defined('ABSPATH') ) {
+if( !defined( 'ABSPATH' ) ) {
     exit;
 }
 
 require_once ABSPATH.'wp-admin/includes/plugin.php';
-
 /**
  * WP_Event_Manager_Rest_API class.
  */
@@ -36,23 +35,21 @@ class WPEM_Rest_API{
      */
     public function __construct()    {
         //if wp event manager not active return from the plugin
-        if (! in_array('wp-event-manager/wp-event-manager.php', apply_filters('active_plugins', get_option('active_plugins'))) ) {
+        if( !in_array( 'wp-event-manager/wp-event-manager.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
             return;
         }
 
         // Define constants
-        define('WPEM_REST_API_VERSION', '1.0.3');
-        define('WPEM_REST_API_FILE', __FILE__);
-        define('WPEM_REST_API_PLUGIN_DIR', untrailingslashit(plugin_dir_path(__FILE__)));
-        define('WPEM_REST_API_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+        define( 'WPEM_REST_API_VERSION', '1.0.4' );
+        define( 'WPEM_REST_API_FILE', __FILE__ );
+        define( 'WPEM_REST_API_PLUGIN_DIR', untrailingslashit( plugin_dir_path(__FILE__ ) ) );
+        define( 'WPEM_REST_API_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path(__FILE__) ), basename(__FILE__) ) ) );
 
-        if(is_admin()) {
+        if( is_admin() ) {
             include 'admin/wpem-rest-api-admin.php';
         }
-
-        include 'wpem-rest-api-functions.php';
-
         //include
+        include 'wpem-rest-api-functions.php';
         include 'includes/wpem-rest-api-dashboard.php';
 
         include 'includes/rest-api/wpem-rest-authentication.php';
@@ -64,10 +61,10 @@ public function __construct()    {
         include 'includes/rest-api/wpem-rest-ecosystem-controller.php';
 
         // Activate
-        register_activation_hook(__FILE__, array( $this, 'install' ));
+        register_activation_hook( __FILE__, array( $this, 'install' ) );
 
         // Add actions
-        add_action('init', array( $this, 'load_plugin_textdomain' ), 12);
+        add_action( 'init', array( $this, 'load_plugin_textdomain' ), 12 );
     }
 
     /**
@@ -75,9 +72,9 @@ public function __construct()    {
      **/
     public function load_plugin_textdomain(){
         $domain = 'wpem-rest-api';
-        $locale = apply_filters('plugin_locale', get_locale(), $domain);
-        load_textdomain($domain, WP_LANG_DIR . "/wpem-rest-api/".$domain."-" .$locale. ".mo");
-        load_plugin_textdomain($domain, false, dirname(plugin_basename(__FILE__)) . '/languages/');
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+        load_textdomain( $domain, WP_LANG_DIR . "/wpem-rest-api/".$domain."-" .$locale. ".mo" );
+        load_plugin_textdomain( $domain, false, dirname( plugin_basename(__FILE__) ) . '/languages/' );
     }
 
     /**
@@ -87,14 +84,13 @@ public function install(){
         global $wpdb;
 
         $wpdb->hide_errors();
-
         $collate = '';
 
-        if ($wpdb->has_cap('collation') ) {
-            if (! empty($wpdb->charset) ) {
+        if( $wpdb->has_cap( 'collation' ) ) {
+            if( !empty( $wpdb->charset ) ) {
                 $collate .= "DEFAULT CHARACTER SET $wpdb->charset";
             }
-            if (! empty($wpdb->collate) ) {
+            if( !empty( $wpdb->collate ) ) {
                 $collate .= " COLLATE $wpdb->collate";
             }
         }
@@ -103,55 +99,57 @@ public function install(){
 
         // Table for storing licence keys for purchases
         $sql = "
-CREATE TABLE {$wpdb->prefix}wpem_rest_api_keys (
-  key_id BIGINT UNSIGNED NOT NULL auto_increment,
-  app_key varchar(200) NOT NULL,	
-  user_id BIGINT UNSIGNED NOT NULL,
-  event_id varchar(255) NULL,
-  description varchar(200) NULL,
-  permissions varchar(10) NOT NULL,
-  consumer_key char(64) NOT NULL,
-  consumer_secret char(43) NOT NULL,
-  nonces longtext NULL,
-  truncated_key char(7) NOT NULL,
-  last_access datetime NULL default null,
-  date_created datetime NULL default null,
-  date_expires datetime NULL default null,
-  PRIMARY KEY  (key_id),
-  KEY consumer_key (consumer_key),
-  KEY consumer_secret (consumer_secret)
-) $collate;";
-
-        dbDelta($sql);
-
-        update_option('wpem_rest_api_version', WPEM_REST_API_VERSION);
+            CREATE TABLE {$wpdb->prefix}wpem_rest_api_keys (
+            key_id BIGINT UNSIGNED NOT NULL auto_increment,
+            app_key varchar(200) NOT NULL,	
+            user_id BIGINT UNSIGNED NOT NULL,
+            event_id varchar(255) NULL,
+            description varchar(200) NULL,
+            permissions varchar(10) NOT NULL,
+            consumer_key char(64) NOT NULL,
+            consumer_secret char(43) NOT NULL,
+            nonces longtext NULL,
+            truncated_key char(7) NOT NULL,
+            last_access datetime NULL default null,
+            date_created datetime NULL default null,
+            date_expires datetime NULL default null,
+            PRIMARY KEY  (key_id),
+            KEY consumer_key (consumer_key),
+            KEY consumer_secret (consumer_secret)
+            ) $collate;";
+
+        dbDelta( $sql );
+
+        update_option( 'wpem_rest_api_version', WPEM_REST_API_VERSION );
+        
+        //check for Application Name is already defined
+        if( empty( get_option( 'wpem_rest_api_app_name' ) ) ) {
+            update_option( 'wpem_rest_api_app_name', 'WP Event Manager' );
+        };
     }
-
-
 }
 
 // check for WP Event Manager is active
-if (is_plugin_active('wp-event-manager/wp-event-manager.php') ) {
+if( is_plugin_active( 'wp-event-manager/wp-event-manager.php' ) ) {
     $GLOBALS['wpem_rest_api'] = new WPEM_Rest_API();
 }
 
 /**
  * Check if WP Event Manager is not active then show notice at admin
- *
  * @since 1.0.0
  */
-function wpem_rest_api_pre_check_before_installing_event_rest_api(){
+function wpem_rest_api_pre_check_before_installing_event_rest_api() {
     /*
     * Check weather WP Event Manager is installed or not
     */
-    if (! in_array('wp-event-manager/wp-event-manager.php', apply_filters('active_plugins', get_option('active_plugins'))) ) {
+    if( !in_array( 'wp-event-manager/wp-event-manager.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
             global $pagenow;
         if($pagenow == 'plugins.php' ) {
-               echo '<div id="error" class="error notice is-dismissible"><p>';
-               echo __('WP Event Manager is require to use WP Event Manager Rest API ', 'wpem-rest-api');
-               echo '</p></div>';
+            echo '<div id="error" class="error notice is-dismissible"><p>';
+            echo __( 'WP Event Manager is require to use WP Event Manager Rest API ', 'wpem-rest-api' );
+            echo '</p></div>';
         }
-            return false;
+        return false;
     }
 }
-add_action('admin_notices', 'wpem_rest_api_pre_check_before_installing_event_rest_api');
+add_action( 'admin_notices', 'wpem_rest_api_pre_check_before_installing_event_rest_api' );
\ No newline at end of file