diff --git a/core/ApiController.php b/core/ApiController.php
index b8e1f5740..b3af31ab0 100644
--- a/core/ApiController.php
+++ b/core/ApiController.php
@@ -51,7 +51,7 @@ protected function _exceptionHandler(Exception $e)
     {
     $errorInfo['code'] = $e->getCode();
     $errorInfo['msg'] = $e->getMessage();
-    switch ($errorInfo['code'])
+    switch($errorInfo['code'])
       {
       case MIDAS_INVALID_PARAMETER:
       case MIDAS_INVALID_POLICY:
@@ -130,7 +130,7 @@ protected function _genericAction($args, $resource, $restAction, $apiFunctions,
           $calledFunction = $calledFunction . 'Wrapper';
         }
         $resultsArray = $ApiComponent->$calledFunction($args, $userDao);
-        if (isset($resultsArray))
+        if(isset($resultsArray))
           {
           $apiResults['data'] = $resultsArray;
           }
@@ -139,7 +139,7 @@ protected function _genericAction($args, $resource, $restAction, $apiFunctions,
           $apiResults['msg'] = "succeed!"; // there is no exception if code reaches here
           }
         }
-      catch (Exception $e)
+      catch(Exception $e)
         {
         list($apiResults['error'], $httpCode) = $this->_exceptionHandler($e);
         }
diff --git a/core/constant/global.php b/core/constant/global.php
index 5c2079a8e..4a7eafec3 100644
--- a/core/constant/global.php
+++ b/core/constant/global.php
@@ -18,7 +18,7 @@
  limitations under the License.
 =========================================================================*/
 
-if (file_exists(BASE_PATH . '/core/configs/core.local.ini'))
+if(file_exists(BASE_PATH . '/core/configs/core.local.ini'))
   {
   define('CORE_CONFIG', BASE_PATH . '/core/configs/core.local.ini');
   }
@@ -27,7 +27,7 @@
   define('CORE_CONFIG', BASE_PATH . '/core/configs/core.ini');
   }
 
-if (file_exists(BASE_PATH . '/core/configs/application.local.ini'))
+if(file_exists(BASE_PATH . '/core/configs/application.local.ini'))
   {
   define('APPLICATION_CONFIG', BASE_PATH . '/core/configs/application.local.ini');
   }
@@ -36,7 +36,7 @@
   define('APPLICATION_CONFIG', BASE_PATH . '/core/configs/application.ini');
   }
 
-if (file_exists(BASE_PATH . '/core/configs/database.local.ini'))
+if(file_exists(BASE_PATH . '/core/configs/database.local.ini'))
   {
   define('DATABASE_CONFIG', BASE_PATH . '/core/configs/database.local.ini');
   }
diff --git a/core/controllers/components/ExportComponent.php b/core/controllers/components/ExportComponent.php
index 67c62f4c5..df8abe9b8 100644
--- a/core/controllers/components/ExportComponent.php
+++ b/core/controllers/components/ExportComponent.php
@@ -185,7 +185,7 @@ function exportBitstreams($userDao, $targetDir, $itemIds, $shouldSymLink)
               }
             } // end foreach($bitstreams as $bitstream)
           } // end if(!empty($bitstreams))
-        } // end foreach ($revisions ...
+        } // end foreach($revisions ...
       }
     } // end function exportBitstreams
   } // end class
diff --git a/core/layouts/empty.phtml b/core/layouts/empty.phtml
index b0f7237e2..a83180c72 100644
--- a/core/layouts/empty.phtml
+++ b/core/layouts/empty.phtml
@@ -38,7 +38,7 @@ echo $this->doctype()
   <!-- Import CSS -->
   <link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
   <?php
-  if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
+  if(Zend_Registry::get("configGlobal")->smartoptimizer == 1)
     {
     echo '<link type="text/css" rel="stylesheet" href="'.$this->coreWebroot.'/public/css/layout/view.css,'.
          'midas.empty.css,'.
diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml
index 54b2c58cd..43b364d37 100644
--- a/core/layouts/layout.phtml
+++ b/core/layouts/layout.phtml
@@ -40,7 +40,7 @@ echo $this->doctype()
     <!-- Import CSS -->
     <link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
     <?php
-    if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
+    if(Zend_Registry::get("configGlobal")->smartoptimizer == 1)
       {
       echo '<link type="text/css" rel="stylesheet" href="'.$this->coreWebroot.'/public/css/layout/midas.layout.css,'.
            'view.css,'.
@@ -170,7 +170,7 @@ echo $this->doctype()
                 }
               else
                 {
-                if (!isset(Zend_Registry::get('configGlobal')->closeregistration) || Zend_Registry::get('configGlobal')->closeregistration == "0")
+                if(!isset(Zend_Registry::get('configGlobal')->closeregistration) || Zend_Registry::get('configGlobal')->closeregistration == "0")
                   {
                   echo '<a class="registerLink" href="#" > '.$this->t('Register').'</a>';
                   }
@@ -317,7 +317,7 @@ echo $this->doctype()
               echo "<h1>{$this->t('Recently Viewed')}</h1>";
               $recentReverse=array_reverse($this->recentItems);
               echo '<ul>';
-              foreach ($recentReverse as $item)
+              foreach($recentReverse as $item)
                 {
                 if(is_array($item))
                   {
@@ -330,7 +330,7 @@ echo $this->doctype()
           </div>
           <div class="SubMainContent">
             <?php
-            if (isset($this->header))
+            if(isset($this->header))
               {
               echo "<div class='viewHeader'><span class='headerSpan'>{$this->header} </span></div>";
               }
@@ -367,7 +367,7 @@ echo $this->doctype()
       <hr style="display: none;"/>
     </div>
     <?php
-      if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
+      if(Zend_Registry::get("configGlobal")->smartoptimizer == 1)
         {
         echo '<script type="text/javascript" src="' . $this->coreWebroot.'/public/js/layout/jquery.js,'.
              'jquery-ui.js,'.
diff --git a/core/views/admin/index.phtml b/core/views/admin/index.phtml
index d912867f4..cd10abd19 100644
--- a/core/views/admin/index.phtml
+++ b/core/views/admin/index.phtml
@@ -141,7 +141,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
          }
        echo "<br/>Path: <span class='assetstorePath'>{$assetstore->getPath()}</span>";
        echo "<br/>Type: ";
-       switch ($assetstore->getType())
+       switch($assetstore->getType())
          {
           case MIDAS_ASSETSTORE_LOCAL:
               echo "Local";
diff --git a/core/views/user/index.phtml b/core/views/user/index.phtml
index cf0dec3f2..871ba78aa 100644
--- a/core/views/user/index.phtml
+++ b/core/views/user/index.phtml
@@ -19,7 +19,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/jquery/jquery.for
   <div class="userList">
   <?php
   echo "<h3 class='userSubTitle'>";
-  switch ($this->order)
+  switch($this->order)
     {
     case 'lastname':
       echo $this->t('Alphabetic');
@@ -34,7 +34,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/jquery/jquery.for
   if($this->order == 'lastname')
     {
     echo "<a href='{$this->webroot}/user?order=lastname'>{$this->t('All')}</a> ";
-    for ($i = ord('A'); $i <= ord('Z'); $i++)
+    for($i = ord('A'); $i <= ord('Z'); $i++)
       {
       if($this->offset === chr($i))
         {
diff --git a/modules/dicomextractor/controllers/components/ExtractorComponent.php b/modules/dicomextractor/controllers/components/ExtractorComponent.php
index d20a9d7ab..0500be7a5 100644
--- a/modules/dicomextractor/controllers/components/ExtractorComponent.php
+++ b/modules/dicomextractor/controllers/components/ExtractorComponent.php
@@ -119,7 +119,7 @@ public function isDCMTKWorking()
       $dataDictVar = $modulesConfig['dicomextractor']->dcmdictpath;
       $dictPaths = explode(":", $dataDictVar);
       $errorInDictVar = false;
-      foreach ($dictPaths as $path)
+      foreach($dictPaths as $path)
         {
         if(!is_readable($path))
           {
@@ -257,7 +257,7 @@ public function extract($revision)
                                            $row['value']);
           }
         }
-      catch (Zend_Exception $exc)
+      catch(Zend_Exception $exc)
         {
         echo $exc->getMessage();
         }
diff --git a/modules/dicomserver/controllers/components/ApiserverComponent.php b/modules/dicomserver/controllers/components/ApiserverComponent.php
index 3b79435a3..5039c97e0 100644
--- a/modules/dicomserver/controllers/components/ApiserverComponent.php
+++ b/modules/dicomserver/controllers/components/ApiserverComponent.php
@@ -113,12 +113,12 @@ function start($args)
       $incoming_dir = $serverComponent->getDefaultReceptionDir();
       }
     $processing_dir = $incoming_dir . PROCESSING_DIR;
-    if (!file_exists($processing_dir))
+    if(!file_exists($processing_dir))
       {
       KWUtils::mkDir($processing_dir, 0777);
       }
     $log_dir = $incoming_dir . LOG_DIR;
-    if (!file_exists($log_dir))
+    if(!file_exists($log_dir))
       {
        KWUtils::mkDir($log_dir, 0777);
       }
@@ -128,7 +128,7 @@ function start($args)
       $dcmqrscp_cmd = $args['dcmqrscp_cmd'];
       }
     $dcmqrscp_pacs_dir = $incoming_dir . PACS_DIR;
-    if (!file_exists($dcmqrscp_pacs_dir))
+    if(!file_exists($dcmqrscp_pacs_dir))
       {
        KWUtils::mkDir($dcmqrscp_pacs_dir, 0777);
       }
@@ -158,7 +158,7 @@ function start($args)
       $start_server_command_string = str_replace("'", "", $start_server_command);
       return escapeshellarg($start_server_command_string);
       }
-    if (!isset($serverComponent))
+    if(!isset($serverComponent))
       {
       $serverComponent = MidasLoader::loadComponent('Server', 'dicomserver');
       }
@@ -211,7 +211,7 @@ function status($args)
       }
 
     $ret = array();
-    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+    if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
       { // currently not supported in windows
       $ret['status'] = MIDAS_DICOM_SERVER_NOT_SUPPORTED;
       return $ret;
@@ -227,7 +227,7 @@ function status($args)
     KWUtils::exec($ps_command, $output);
     $runningSCPs = 0;
     $totalSCPs = 2;
-    foreach ($output as $line)
+    foreach($output as $line)
       {
       $fields = preg_split("/\s+/", trim($line));
       $process = $fields[4];
@@ -237,7 +237,7 @@ function status($args)
         # need to be updated if python script is changed
         $ret['user_email'] = $fields[21];
         $runningSCPs += 1;
-        if ($runningSCPs == $totalSCPs)
+        if($runningSCPs == $totalSCPs)
           {
           break;
           }
@@ -246,7 +246,7 @@ function status($args)
         {
         $ret['status'] += MIDAS_DICOM_DCMQRSCP_IS_RUNNING;
         $runningSCPs += 1;
-        if ($runningSCPs == $totalSCPs)
+        if($runningSCPs == $totalSCPs)
           {
           break;
           }
@@ -314,7 +314,7 @@ function stop($args)
       $incoming_dir = $serverComponent->getDefaultReceptionDir();
       }
     $log_dir = $incoming_dir . LOG_DIR;
-    if (!file_exists($log_dir))
+    if(!file_exists($log_dir))
       {
        KWUtils::mkDir($log_dir, 0777);
       }
diff --git a/modules/dicomserver/controllers/components/ServerComponent.php b/modules/dicomserver/controllers/components/ServerComponent.php
index 153da87ec..279690754 100644
--- a/modules/dicomserver/controllers/components/ServerComponent.php
+++ b/modules/dicomserver/controllers/components/ServerComponent.php
@@ -34,13 +34,13 @@ public function isDICOMServerWorking()
     $ret['dcmqridx'] = $kwdicomextractorComponent->getApplicationStatus($dcmqridxCommand,
                                                    'dcmqridx');
     $receptionDir= $modulesConfig['dicomserver']->receptiondir;
-    if (empty($receptionDir))
+    if(empty($receptionDir))
       {
       $receptionDir = $this->getDefaultReceptionDir();
       }
     $ret['Reception Directory Writable'] = array(is_writable($receptionDir));
     $peer_aes = $modulesConfig['dicomserver']->peer_aes;
-    if (!empty($peer_aes) && strpos($peer_aes, '(') !== false && strpos($peer_aes, ')') !== false)
+    if(!empty($peer_aes) && strpos($peer_aes, '(') !== false && strpos($peer_aes, ')') !== false)
       {
       $ret['Peer AE List Not Empty'] = array(true, "At least one peer AE is given");
       }
@@ -52,19 +52,19 @@ public function isDICOMServerWorking()
     $status_args['storescp_cmd']= $storescpCommand;
     $status_args['dcmqrscp_cmd']= $dcmqrscpCommand;
     $status_results = $apiComponent->status($status_args);
-    if ($status_results['status'] == MIDAS_DICOM_STORESCP_IS_RUNNING + MIDAS_DICOM_DCMQRSCP_IS_RUNNING)
+    if($status_results['status'] == MIDAS_DICOM_STORESCP_IS_RUNNING + MIDAS_DICOM_DCMQRSCP_IS_RUNNING)
       {
       $ret['Status'] = array(true, "DICOM Server is running");
       }
-    else if ($status_results['status'] == MIDAS_DICOM_STORESCP_IS_RUNNING)
+    else if($status_results['status'] == MIDAS_DICOM_STORESCP_IS_RUNNING)
       {
       $ret['Status'] = array(false, 'DICOM C-STORE receiver is running, but DICOM Query/Retrieve service are NOT running');
       }
-    else if ($status_results['status'] == MIDAS_DICOM_DCMQRSCP_IS_RUNNING)
+    else if($status_results['status'] == MIDAS_DICOM_DCMQRSCP_IS_RUNNING)
       {
       $ret['Status'] = array(false, 'DICOM Query/Retrieve services are running, but DICOM C-STORE receiver is NOT running');
       }
-    else if ($status_results['status'] == MIDAS_DICOM_SERVER_NOT_RUNNING)
+    else if($status_results['status'] == MIDAS_DICOM_SERVER_NOT_RUNNING)
       {
       $ret['Status'] = array(false, "DICOM Server is not running");
       }
diff --git a/modules/metadataextractor/controllers/components/ExtractorComponent.php b/modules/metadataextractor/controllers/components/ExtractorComponent.php
index 88e82e146..ea92b497f 100644
--- a/modules/metadataextractor/controllers/components/ExtractorComponent.php
+++ b/modules/metadataextractor/controllers/components/ExtractorComponent.php
@@ -54,7 +54,7 @@ public function extract($revision)
           $MetadataModel->addMetadataValue($revision, MIDAS_METADATA_TEXT,
                        'misc', $name, $property);
           }
-        catch (Zend_Exception $exc)
+        catch(Zend_Exception $exc)
           {
           echo $exc->getMessage();
           }
@@ -87,7 +87,7 @@ public function extract($revision)
           $MetadataModel->addMetadataValue($revision, MIDAS_METADATA_TEXT,
                'misc', $name, $value);
           }
-        catch (Zend_Exception $exc)
+        catch(Zend_Exception $exc)
           {
           echo $exc->getMessage();
           }
diff --git a/modules/mfa/controllers/components/OtpComponent.php b/modules/mfa/controllers/components/OtpComponent.php
index 920877ca8..26684e2da 100644
--- a/modules/mfa/controllers/components/OtpComponent.php
+++ b/modules/mfa/controllers/components/OtpComponent.php
@@ -128,7 +128,7 @@ protected function _radiusauth($otpDevice, $token)
     /* this is the one time pin + 6-digit hard token or 8 digit smart token */
     radius_put_attr($rh, RADIUS_USER_PASSWORD, $token);
 
-    switch (radius_send_request($rh))
+    switch(radius_send_request($rh))
       {
       case RADIUS_ACCESS_ACCEPT:
         $this->getLogger()->info("MIDAS RADIUS successful authentication " .
diff --git a/modules/scheduler/layouts/layout-disable.phtml b/modules/scheduler/layouts/layout-disable.phtml
index 4ae0b4a8a..16237a1bb 100644
--- a/modules/scheduler/layouts/layout-disable.phtml
+++ b/modules/scheduler/layouts/layout-disable.phtml
@@ -20,7 +20,7 @@ echo $this->doctype() ?>
     <!-- Import CSS -->
     <link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
     <?php
-    if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
+    if(Zend_Registry::get("configGlobal")->smartoptimizer == 1)
       {
       echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/midas.layout.css,view.css,jquery-ui.css,form.css,loginForm.css,jquery.treeTable.css,jquery.cluetip.css" />';
       }
@@ -160,7 +160,7 @@ echo $this->doctype() ?>
               echo "<h1>{$this->t('Recently Viewed')}</h1>";
               $recentReverse=array_reverse($this->recentItems);
               echo '<ul>';
-              foreach ($recentReverse as $item)
+              foreach($recentReverse as $item)
                 {
                 echo "<li onclick=\"location.replace('{$this->webroot}/item/{$item->getKey()}');\" class='recentItem' title='".  str_replace("'", '"', $item->getName())." | todo'><a  href='{$this->webroot}/item/{$item->getKey()}'>".sliceRecentItem($item->getName())."</a></li>";
                 }
@@ -170,7 +170,7 @@ echo $this->doctype() ?>
           </div>
           <div class="SubMainContent">
             <?php
-            if (isset($this->header))
+            if(isset($this->header))
               {
               echo "<div class='viewHeader'>{$this->header} </div>";
               }
@@ -194,7 +194,7 @@ echo $this->doctype() ?>
       <hr style="display: none;"/>
     </div>
     <?php
-              if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
+              if(Zend_Registry::get("configGlobal")->smartoptimizer == 1)
                 {
                 echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery.js,jquery-ui.js,midas.layout.js,jquery.treeTable.js,jquery.cluetip.js"></script>';
                 }