diff --git a/accounts.php b/accounts.php
index 4fe99e0e..b4fbae9e 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,7 +1,7 @@
 <?php require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "account_name";
 }
diff --git a/ajax.php b/ajax.php
index a9247a13..33b2ee7a 100644
--- a/ajax.php
+++ b/ajax.php
@@ -34,7 +34,7 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) {
 
     // Get certificate (using verify peer false to allow for self-signed certs)
     $socket = "ssl://$url:$port";
-    $get = stream_context_create(array("ssl" => array("capture_peer_cert" => TRUE, "verify_peer" => FALSE,)));
+    $get = stream_context_create(array("ssl" => array("capture_peer_cert" => true, "verify_peer" => false,)));
     $read = stream_socket_client($socket, $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $get);
     $cert = stream_context_get_params($read);
     $cert_public_key_obj = openssl_x509_parse($cert['options']['ssl']['peer_certificate']);
@@ -121,7 +121,7 @@ if (isset($_GET['merge_ticket_get_json_details'])) {
         //Return ticket, client and contact details for the given ticket number
         $response = mysqli_fetch_array($sql);
         $response = array_map('htmlentities', $response);
-        echo json_encode( $response);
+        echo json_encode($response);
     }
 }
 
@@ -308,4 +308,4 @@ if (isset($_GET['get_totp_token'])) {
     $otp = TokenAuth6238::getTokenCode($_GET['totp_secret']);
 
     echo json_encode($otp);
-}
\ No newline at end of file
+}
diff --git a/footer.php b/footer.php
index fea993fe..73fdbfc4 100644
--- a/footer.php
+++ b/footer.php
@@ -7,11 +7,11 @@
 	<!-- ./wrapper -->
 
 	<!-- REQUIRED SCRIPTS -->
-	
+
 	<!-- Bootstrap 4 -->
 	<script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 	<!-- Custom js-->
-	
+
 	<script src="plugins/moment/moment.min.js"></script>
 	<script src="plugins/chart.js/Chart.min.js"></script>
 	<script src="plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
@@ -29,12 +29,10 @@
 	</body>
 </html>
 
-<?php 
+<?php
 
 // Calculate Execution time Uncomment for test
 
 //$time_end = microtime(true);
 //$execution_time = ($time_end - $time_start);
 //echo 'Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds';
-
-?>
\ No newline at end of file
diff --git a/inc_client_top_head.php b/inc_client_top_head.php
index 3f762280..c98d70b7 100644
--- a/inc_client_top_head.php
+++ b/inc_client_top_head.php
@@ -22,22 +22,22 @@ $location_phone = formatPhoneNumber($location_phone);
         ?>
           <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <a href="tel:<?php echo $location_phone?>"><?php echo $location_phone; ?></a>
         <br>
-        <?php 
-        } 
+        <?php
+        }
         ?>
         <?php
         if (!empty($client_website)) {
         ?>
           <i class="fa fa-fw fa-globe text-secondary ml-1 mr-2 mb-2"></i> <a target="_blank" href="//<?php echo $client_website; ?>"><?php echo $client_website; ?></a>
         <br>
-        <?php 
+        <?php
         }
         ?>
         <?php
         if (!empty($client_tag_name_display_array)) {
         ?>
         <?php echo $client_tags_display; ?>
-        <?php 
+        <?php
         }
         ?>
       </div>
@@ -63,7 +63,7 @@ $location_phone = formatPhoneNumber($location_phone);
         if (!empty($contact_phone)) {
         ?>
           <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <a href="tel:<?php echo $contact_phone; ?>"><?php echo $contact_phone; ?> </a>
-        <?php 
+        <?php
         if (!empty($contact_extension)) {
         ?>
         x<?php echo $contact_extension; ?>
@@ -71,18 +71,18 @@ $location_phone = formatPhoneNumber($location_phone);
         }
         ?>
         <br>
-        <?php 
-        } 
+        <?php
+        }
         ?>
         <?php
         if (!empty($contact_mobile)) {
         ?>
           <i class="fa fa-fw fa-mobile-alt text-secondary ml-1 mr-2 mb-2"></i> <a href="tel:<?php echo $contact_mobile; ?>"> <?php echo $contact_mobile; ?> </a>
-        <?php 
-        } 
+        <?php
+        }
         ?>
       </div>
-      <?php if ($session_user_role == 1 || $session_user_role == 3 AND $config_module_enable_accounting == 1) { ?>
+      <?php if ($session_user_role == 1 || $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
       <div class="col-md border-left">
         <h4 class="text-secondary">Billing</h4>
         <h6 class="ml-1 text-secondary">Paid <div class="text-dark float-right"> <?php echo numfmt_format_currency($currency_format, $amount_paid, $client_currency_code); ?></div></h6>
@@ -120,10 +120,10 @@ $location_phone = formatPhoneNumber($location_phone);
   </div>
 </div>
 
-<?php 
-  
+<?php
+
   include("client_edit_modal.php");
   include("client_delete_modal.php");
   include("category_quick_add_modal.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/side_nav.php b/side_nav.php
index 78932e27..7fecbf77 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -131,7 +131,7 @@
 
                 <?php } ?>
 
-                <?php if ($session_user_role == 1 OR $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
+                <?php if ($session_user_role == 1 || $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
 
                     <li class="nav-header mt-3">ACCOUNTING</li>
                     <li class="nav-item">