diff --git a/src/EventEditor.php b/src/EventEditor.php
index ee976bbda5..3ff029a290 100644
--- a/src/EventEditor.php
+++ b/src/EventEditor.php
@@ -1,27 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : EventEditor.php
- *  last change : 2005-09-10
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2005 Todd Pillars
- *                Copyright 2012 Michael Wilt
- *
- *  function    : Editor for Church Events
- *
- ******************************************************************************/
-
-// table fields
-//  event_id       int(11)
-//  event_type     enum('CS', 'SS', 'VOL')
-//  event_title    varchar(255)
-//  event_desc     varchar(255)
-//  event_text     text
-//  event_start    datetime
-//  event_end      datetime
-//  inactive       int(1) default 0
-
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -30,14 +8,14 @@
 use ChurchCRM\model\ChurchCRM\Event;
 use ChurchCRM\model\ChurchCRM\EventQuery;
 use ChurchCRM\Utils\InputUtils;
-use ChurchCRM\Utils\RedirectUtils;
+
+AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isAddEvent());
 
 $sPageTitle = gettext('Church Event Editor');
 
-AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isAddEvent());
+require 'Include/Header.php';
 
 $sAction = 'Create Event';
-require 'Include/Header.php';
 
 if (isset($_GET['calendarAction'])) {
     $sAction = 'Edit';
@@ -49,35 +27,28 @@
 
     if (array_key_exists('EID', $_POST)) {
         $sOpp = $_POST['EID'];
-    } // from EDIT button on event listing
+    }
 
     if (array_key_exists('EN_tyid', $_POST)) {
         $tyid = $_POST['EN_tyid'];
-    } else {  // from event type list page
+    } else {
         $tyid = 0;
     }
 }
 
+$EventExists = 0;
 $iEventID = 0;
 $iErrors = 0;
 
-if (!$sAction) {
-    $sAction = 'Create Event';
-}
-
-//
-// process the action inputs
-//
 if ($sAction === 'Create Event' && !empty($tyid)) {
-    //
-    // user is coming from the event types screen and thus there
+
+    // User is coming from the event types screen and thus there
     // is no existing event in the event_event table
     //
     // will use the event type information to smart-prefill the
     // event fields...but still allow the user to edit everything
     // except event type since event type is tied to the attendance count fields
-    //
-    $EventExists = 0;
+
     $sSQL = "SELECT * FROM event_types WHERE type_id=$tyid";
     $rsOpps = RunQuery($sSQL);
     $numRows = mysqli_num_rows($rsOpps);
@@ -112,10 +83,9 @@
     }
     $nCnts = $iNumCounts;
     $sCountNotes = '';
-    //
-    // this switch manages the smart-prefill of the form based on the event type
+
+    // This switch manages the smart-prefill of the form based on the event type
     // definitions, recurrence type, etc.
-    //
     switch ($sDefRecurType) {
         case 'none':
             $sEventStartDate = date('Y-m-d');
@@ -128,13 +98,13 @@
             break;
 
         case 'weekly':
-            // check for the last occurrence of this type_id in the events table and
+            // Check for the last occurrence of this type_id in the events table and
             // create a new event based on this date reference
             $sSQL = "SELECT * FROM events_event WHERE event_type = '$iTypeID' ORDER BY event_start DESC LIMIT 1";
             $ecOpps = RunQuery($sSQL);
             $numRows = mysqli_num_rows($ecOpps);
             if ($numRows > 0) {
-                // use the most recent event if it exists
+                // Use the most recent event if it exists
                 $ecRow = mysqli_fetch_array($ecOpps, MYSQLI_BOTH);
                 extract($ecRow);
                 $aStartTokens = explode(' ', $event_start);
@@ -149,7 +119,7 @@
                 $iEventEndHour = $iEventStartHour + 1;
                 $iEventEndMins = $iEventStartMins;
             } else {
-                // use the event type definition
+                // Use the event type definition
                 $sEventStartDate = date('Y-m-d', strtotime("last $iDefRecurDOW"));
                 $aStartTimeTokens = explode(':', $sDefStartTime);
                 $iEventStartHour = $aStartTimeTokens[0];
@@ -161,13 +131,13 @@
             break;
 
         case 'monthly':
-            // check for the last occurrence of this type_id in the events table and
+            // Check for the last occurrence of this type_id in the events table and
             // create a new event based on this date reference
             $sSQL = "SELECT * FROM events_event WHERE event_type = '$iTypeID' ORDER BY event_start DESC LIMIT 1";
             $ecOpps = RunQuery($sSQL);
             $numRows = mysqli_num_rows($ecOpps);
             if ($numRows > 0) {
-                // use the most recent event if it exists
+                // Use the most recent event if it exists
                 $ecRow = mysqli_fetch_array($ecOpps, MYSQLI_BOTH);
                 extract($ecRow);
                 $aStartTokens = explode(' ', $event_start);
@@ -182,7 +152,7 @@
                 $iEventEndHour = intval($aEventStartTimeTokens[0]) + 1;
                 $iEventEndMins = $aEventStartTimeTokens[1];
             } else {
-                // use the event type definition
+                // Use the event type definition
                 $currentDOM = date('d');
                 if ($currentDOM < $iDefRecurDOM) {
                     $sEventStartDate = date('Y-m-d', mktime(0, 0, 0, date('m') - 1, $iDefRecurDOM, date('Y')));
@@ -204,7 +174,7 @@
             $ecOpps = RunQuery($sSQL);
             $numRows = mysqli_num_rows($ecOpps);
             if ($numRows > 0) {
-                // use the most recent event if it exists
+                // Use the most recent event, if it exists
                 $ecRow = mysqli_fetch_array($ecOpps, MYSQLI_BOTH);
                 extract($ecRow);
                 $aStartTokens = explode(' ', $event_start);
@@ -219,15 +189,18 @@
                 $iEventEndHour = intval($aEventStartTimeTokens[0]) + 1;
                 $iEventEndMins = $aEventStartTimeTokens[1];
             } else {
-                // use the event type definition
+                // Use the event type definition
                 $currentDOY = time();
                 $defaultDOY = strtotime($sDefRecurDOY);
-                if ($currentDOY < $defaultDOY) {  // event is future
+                if ($currentDOY < $defaultDOY) {
+                    // Event is in the future
                     $sEventStartDate = $sDefRecurDOY;
-                } elseif ($currentDOY > $defaultDOY + (365 * 24 * 60 * 60)) {  // event is over 1 year past
+                } elseif ($currentDOY > $defaultDOY + (365 * 24 * 60 * 60)) {
+                    // Event is over 1 year in the past
                     $aDMY = explode('-', $sDefRecurDOY);
                     $sEventStartDate = date('Y-m-d', mktime(0, 0, 0, $aDMY[1], $aDMY[2], date('Y') - 1));
-                } else { // event is past
+                } else {
+                    // Event is past
                     $aDMY = explode('-', $sDefRecurDOY);
                     $sEventStartDate = date('Y-m-d', mktime(0, 0, 0, $aDMY[1], $aDMY[2], date('Y')));
                 }
@@ -247,7 +220,6 @@
     $iEventStatus = 0;
     $iTypeID = $type_id;
 } elseif ($sAction = 'Edit' && !empty($sOpp)) {
-    // Get data for the form as it now exists..
     $EventExists = 1;
     $sSQL = "SELECT * FROM events_event as t1, event_types as t2 WHERE t1.event_type = t2.type_id AND t1.event_id ='" . $sOpp . "' LIMIT 1";
     $rsOpps = RunQuery($sSQL);
@@ -274,11 +246,11 @@
     $iEventStatus = $inactive;
 
     $sSQL = "SELECT * FROM eventcounts_evtcnt WHERE evtcnt_eventid='$iEventID' ORDER BY evtcnt_countid ASC";
-    //        echo $cvSQL;
+
     $cvOpps = RunQuery($sSQL);
     $iNumCounts = mysqli_num_rows($cvOpps);
     $nCnts = $iNumCounts;
-    //        echo "numcounts = {$aNumCounts}\n\l";
+
     if ($iNumCounts) {
         for ($c = 0; $c < $iNumCounts; $c++) {
             $aRow = mysqli_fetch_array($cvOpps, MYSQLI_BOTH);
@@ -290,7 +262,6 @@
         }
     }
 } elseif (isset($_POST['SaveChanges'])) {
-    // Does the user want to save changes to text fields?
     $iEventID = $_POST['EventID'];
     $iTypeID = $_POST['EventTypeID'];
     $EventExists = $_POST['EventExists'];
@@ -342,15 +313,14 @@
 
     $sCountNotes = $_POST['EventCountNotes'];
 
-    // If no errors, then update.
     if ($iErrors === 0) {
-        if ($EventExists == 0) {
+        if ($EventExists === 0) {
             $event = new Event();
             $event
                 ->setType(InputUtils::legacyFilterInput($iTypeID))
                 ->setTitle(InputUtils::legacyFilterInput($sEventTitle))
                 ->setDesc(InputUtils::legacyFilterInput($sEventDesc))
-                ->setText(InputUtils::filterHTML($sEventText))
+                ->setText(InputUtils::legacyFilterInput($sEventText))
                 ->setStart(InputUtils::legacyFilterInput($sEventStart))
                 ->setEnd(InputUtils::legacyFilterInput($sEventEnd))
                 ->setInActive(InputUtils::legacyFilterInput($iEventStatus));
@@ -376,7 +346,7 @@
                 ->setType(InputUtils::legacyFilterInput($iTypeID))
                 ->setTitle(InputUtils::legacyFilterInput($sEventTitle))
                 ->setDesc(InputUtils::legacyFilterInput($sEventDesc))
-                ->setText(InputUtils::filterHTML($sEventText))
+                ->setText(InputUtils::legacyFilterInput($sEventText))
                 ->setStart(InputUtils::legacyFilterInput($sEventStart))
                 ->setEnd(InputUtils::legacyFilterInput($sEventEnd))
                 ->setInActive(InputUtils::legacyFilterInput($iEventStatus));
@@ -398,19 +368,17 @@
         header('Location: ListEvents.php');
     }
 }
-
-// Construct the form
 ?>
 
 <div class='card'>
     <div class='card-header'>
-        <h3><?= ($EventExists == 0) ? gettext('Create a new Event') : gettext('Editing Event ID: ') . $iEventID ?></h3>
+        <h3><?= ($EventExists === 0) ? gettext('Create a new Event') : gettext('Editing Event ID: ') . $iEventID ?></h3>
 
         <?php
-        if ($iErrors !== 0) {
-            echo "<div class='alert alert-danger'>" . gettext('There were ') . $iErrors . gettext(' errors. Please see below') . '</div>';
-        } else {
+        if ($iErrors === 0) {
             echo '<div>' . gettext('Items with a ') . '<span style="color: red">*</span>' . gettext(' are required') . '</div>';
+        } else {
+            echo "<div class='alert alert-danger'>" . gettext('There were ') . $iErrors . gettext(' errors. Please see below') . '</div>';
         }
         ?>
     </div>
@@ -450,7 +418,7 @@
                 </tr>
 
                 <?php
-            } else { // if (empty($iTypeID))?>
+            } else { ?>
                 <tr>
                     <td class="LabelColumn"><span style="color: red">*</span><?= gettext('Event Type') ?>:</td>
                     <td colspan="3" class="TextColumn">
@@ -459,7 +427,6 @@
                         <?= ($iTypeID . '-' . $sTypeName) ?>
                     </td>
                 </tr>
-
                 <tr>
                     <td class="LabelColumn"><span style="color: red">*</span><?= gettext('Event Title') ?>:</td>
                     <td colspan="1" class="TextColumn">
@@ -480,15 +447,13 @@
                         <input type="text" name="EventDateRange" value=""
                                maxlength="10" id="EventDateRange" size="50" class='form-control' width="100%" style="width: 100%" required>
                     </td>
-
                 </tr>
-
                 <tr>
                     <td class="LabelColumn"><?= gettext('Attendance Counts') ?></td>
                     <td class="TextColumn" colspan="3">
                         <input type="hidden" name="NumAttendCounts" value="<?= $nCnts ?>">
                         <?php
-                        if ($nCnts == 0) {
+                        if ($nCnts === 0) {
                             echo gettext('No Attendance counts recorded');
                         } else {
                             ?>
@@ -504,8 +469,7 @@
                                     </td>
                                     </tr>
                                     <?php
-                                } //end for loop
-                                ?>
+                                } ?>
                                 <tr>
                                     <td><strong><?= gettext('Attendance Notes: ') ?>&nbsp;</strong></td>
                                     <td><input type="text" name="EventCountNotes" value="<?= $sCountNotes ?>" class='form-control'>
@@ -513,8 +477,7 @@
                                 </tr>
                             </table>
                             <?php
-                        } //endif
-                        ?>
+                        } ?>
                     </td>
                 </tr>
 
@@ -541,7 +504,7 @@
                     <td><input type="submit" name="SaveChanges" value="<?= gettext('Save Changes') ?>" class="btn btn-primary"></td>
                 </tr>
                 <?php
-            } // if (empty($iTypeID))?>
+            } ?>
         </table>
     </form>
     </div>
diff --git a/src/EventNames.php b/src/EventNames.php
index 6874483c1a..1f549e7740 100644
--- a/src/EventNames.php
+++ b/src/EventNames.php
@@ -1,21 +1,5 @@
 <?php
 
-/*******************************************************************************
- *
- *  filename    : EventNames.php
- *  last change : 2005-09-10
- *  website     : https://churchcrm.io
- *  copyright   : Copyright 2005 Todd Pillars
- *
- *  function    : List all Church Events
-  *
- *
- *  Modified by Stephen Shaffer, Oct 2006
- *  feature changes - added recurring defaults and customizable attendance count
- *  fields
- *
- ******************************************************************************/
-
 require 'Include/Config.php';
 require 'Include/Functions.php';
 
@@ -30,14 +14,9 @@
 
 require 'Include/Header.php';
 
-//
-//  process the ACTION button inputs from the form page
-//
-
 if (isset($_POST['Action'])) {
     switch (InputUtils::legacyFilterInput($_POST['Action'])) {
         case 'CREATE':
-        // Insert into the event_name table
             $eName = $_POST['newEvtName'];
             $eTime = $_POST['newEvtStartTime'];
             $eDOM = $_POST['newEvtRecurDOM'];
@@ -50,9 +29,6 @@
             $eCntNum = count($eCntArray);
             $theID = $_POST['theID'];
 
-          # We need to be able to handle database configurations where MySQL Strict mode is enabled. (#4273)
-          # See: https://dev.mysql.com/doc/refman/en/sql-mode.html#sql-mode-strict
-          # Special thanks to @chiebert (GitHub) for the fix!
             $insert = "INSERT INTO event_types (type_name";
             $values = " VALUES ('" . InputUtils::legacyFilterInput($eName) . "'";
             if (!empty($eTime)) {
@@ -87,7 +63,7 @@
                 $sSQL = "INSERT eventcountnames_evctnm (evctnm_eventtypeid, evctnm_countname) VALUES ('" . InputUtils::legacyFilterInput($theID) . "','" . InputUtils::legacyFilterInput($cCnt) . "') ON DUPLICATE KEY UPDATE evctnm_countname='$cCnt'";
                 RunQuery($sSQL);
             }
-            RedirectUtils::redirect('EventNames.php'); // clear POST
+            RedirectUtils::redirect('EventNames.php');
             break;
 
         case 'DELETE':
@@ -102,13 +78,10 @@
     }
 }
 
-// Get data for the form as it now exists.
-
 $sSQL = 'SELECT * FROM event_types ORDER BY type_id';
 $rsOpps = RunQuery($sSQL);
 $numRows = mysqli_num_rows($rsOpps);
 
-        // Create arrays of the event types
 for ($row = 1; $row <= $numRows; $row++) {
     $aRow = mysqli_fetch_array($rsOpps, MYSQLI_BOTH);
     extract($aRow);
@@ -354,7 +327,6 @@
 
 <script nonce="<?= SystemURLs::getCSPNonce() ?>" >
   $(document).ready(function () {
-//Added by @saulowulhynek to translation of datatable nav terms
     $('#eventNames').DataTable(window.CRM.plugin.dataTable);
   });
 </script>