diff --git a/htdocs/PI/private/index.php b/htdocs/PI/private/index.php
index 131d68312..dbd87c5c7 100644
--- a/htdocs/PI/private/index.php
+++ b/htdocs/PI/private/index.php
@@ -22,4 +22,4 @@
 
     include '../index.php';
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/PI/public/index.php b/htdocs/PI/public/index.php
index 3de6f28a9..fedc043bb 100644
--- a/htdocs/PI/public/index.php
+++ b/htdocs/PI/public/index.php
@@ -21,4 +21,4 @@
     /*====================================================== */
 
     include '../index.php';
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/GOCDB_monitor/check_with_error.php b/htdocs/web_portal/GOCDB_monitor/check_with_error.php
index b96a32287..731cf40e6 100644
--- a/htdocs/web_portal/GOCDB_monitor/check_with_error.php
+++ b/htdocs/web_portal/GOCDB_monitor/check_with_error.php
@@ -4,4 +4,4 @@
     echo("An error has been detected while checking GOCDB services. One or more services might not be working\n");
     exit(2); // return Nagios error code for CRITICAL
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/GOCDB_monitor/tests/URL.php b/htdocs/web_portal/GOCDB_monitor/tests/URL.php
index 7b1116d52..402635e9c 100644
--- a/htdocs/web_portal/GOCDB_monitor/tests/URL.php
+++ b/htdocs/web_portal/GOCDB_monitor/tests/URL.php
@@ -94,4 +94,4 @@ private function get_https($url){
 
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/components/Draw_Components/draw_user_status.php b/htdocs/web_portal/components/Draw_Components/draw_user_status.php
index 51fd27515..5ff244271 100644
--- a/htdocs/web_portal/components/Draw_Components/draw_user_status.php
+++ b/htdocs/web_portal/components/Draw_Components/draw_user_status.php
@@ -58,4 +58,4 @@ function Get_User_Info_HTML($user)
 
         return $Roles_HTML;
     }
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/controllers/admin/add_ngi.php b/htdocs/web_portal/controllers/admin/add_ngi.php
index 6062d928d..fe68f3036 100644
--- a/htdocs/web_portal/controllers/admin/add_ngi.php
+++ b/htdocs/web_portal/controllers/admin/add_ngi.php
@@ -86,4 +86,4 @@ function submit() {
          show_view('error.php', $e->getMessage());
          die();
     }
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/add_scope.php b/htdocs/web_portal/controllers/admin/add_scope.php
index dbe3987e0..ccf2b3ffe 100644
--- a/htdocs/web_portal/controllers/admin/add_scope.php
+++ b/htdocs/web_portal/controllers/admin/add_scope.php
@@ -80,4 +80,4 @@ function submit() {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/controllers/admin/delete_ngi.php b/htdocs/web_portal/controllers/admin/delete_ngi.php
index 8765fe9f7..1bb0c517a 100644
--- a/htdocs/web_portal/controllers/admin/delete_ngi.php
+++ b/htdocs/web_portal/controllers/admin/delete_ngi.php
@@ -90,4 +90,4 @@ function submit() {
 
     show_view('/site/deleted_site.php', $params);
 
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/delete_scope.php b/htdocs/web_portal/controllers/admin/delete_scope.php
index 83426c321..a0d53f00f 100644
--- a/htdocs/web_portal/controllers/admin/delete_scope.php
+++ b/htdocs/web_portal/controllers/admin/delete_scope.php
@@ -93,4 +93,3 @@ function remove_scope(){
     }
 
 }
-
diff --git a/htdocs/web_portal/controllers/admin/delete_service_type.php b/htdocs/web_portal/controllers/admin/delete_service_type.php
index 07b0c06d2..8b0020139 100644
--- a/htdocs/web_portal/controllers/admin/delete_service_type.php
+++ b/htdocs/web_portal/controllers/admin/delete_service_type.php
@@ -48,4 +48,4 @@ function delete_service_type(){
 
     show_view("admin/deleted_service_type.php", $params, $params['Name'].'deleted');
 
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/delete_service_type_denied.php b/htdocs/web_portal/controllers/admin/delete_service_type_denied.php
index c9d97c64a..3c0d8035e 100644
--- a/htdocs/web_portal/controllers/admin/delete_service_type_denied.php
+++ b/htdocs/web_portal/controllers/admin/delete_service_type_denied.php
@@ -38,4 +38,4 @@ function deny_delete_type(){
     //display the deletion denied view
     show_view("admin/delete_service_type_denied.php", $params, 'Deletion Failed');
 
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/edit_scope.php b/htdocs/web_portal/controllers/admin/edit_scope.php
index df92c20ba..9779f7e6c 100644
--- a/htdocs/web_portal/controllers/admin/edit_scope.php
+++ b/htdocs/web_portal/controllers/admin/edit_scope.php
@@ -97,4 +97,4 @@ function submit() {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/controllers/admin/edit_user_identifier.php b/htdocs/web_portal/controllers/admin/edit_user_identifier.php
index bfb6fedf7..d41cf8b42 100644
--- a/htdocs/web_portal/controllers/admin/edit_user_identifier.php
+++ b/htdocs/web_portal/controllers/admin/edit_user_identifier.php
@@ -163,4 +163,4 @@ function submit() {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/controllers/admin/edit_user_isadmin.php b/htdocs/web_portal/controllers/admin/edit_user_isadmin.php
index 2273cdeeb..ef867cae1 100644
--- a/htdocs/web_portal/controllers/admin/edit_user_isadmin.php
+++ b/htdocs/web_portal/controllers/admin/edit_user_isadmin.php
@@ -121,4 +121,4 @@ function submit() {
     }*/
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/controllers/admin/move_service_end_point.php b/htdocs/web_portal/controllers/admin/move_service_end_point.php
index dbf822617..d55201895 100644
--- a/htdocs/web_portal/controllers/admin/move_service_end_point.php
+++ b/htdocs/web_portal/controllers/admin/move_service_end_point.php
@@ -182,4 +182,4 @@ function submitMoveSEP($movementDetails) {
     $params['NewSite'] = $newSite;
     $params['Services'] = $services;
     show_view("admin/moved_service_end_point.php", $params);
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/move_site.php b/htdocs/web_portal/controllers/admin/move_site.php
index 21ce1e873..f101894b2 100644
--- a/htdocs/web_portal/controllers/admin/move_site.php
+++ b/htdocs/web_portal/controllers/admin/move_site.php
@@ -180,4 +180,4 @@ function submitMoveSite($movementDetails) {
     $params['sites'] = $sites;
 
     show_view("admin/moved_site.php", $params);
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/controllers/admin/users.php b/htdocs/web_portal/controllers/admin/users.php
index c309db037..8b44892bd 100644
--- a/htdocs/web_portal/controllers/admin/users.php
+++ b/htdocs/web_portal/controllers/admin/users.php
@@ -68,4 +68,4 @@ function show_users() {
     $params["Users"] = \Factory::getUserService()->getUsers($surname, $forename, $idString, $isAdmin);
 
     show_view("admin/users.php", $params, "Users");
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/views/admin/add_ngi.php b/htdocs/web_portal/views/admin/add_ngi.php
index f8485014e..534d1e92f 100644
--- a/htdocs/web_portal/views/admin/add_ngi.php
+++ b/htdocs/web_portal/views/admin/add_ngi.php
@@ -67,4 +67,4 @@
             '#optionalScopeCheckBoxDIV',
             true);
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/htdocs/web_portal/views/admin/add_project.php b/htdocs/web_portal/views/admin/add_project.php
index cb3e6fa97..039288498 100644
--- a/htdocs/web_portal/views/admin/add_project.php
+++ b/htdocs/web_portal/views/admin/add_project.php
@@ -10,4 +10,4 @@
         <br />
         <input type="submit" value="Add Project" class="input_button">
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/add_scope.php b/htdocs/web_portal/views/admin/add_scope.php
index 88fade79c..b460ddf7d 100644
--- a/htdocs/web_portal/views/admin/add_scope.php
+++ b/htdocs/web_portal/views/admin/add_scope.php
@@ -11,4 +11,4 @@
         <br />
         <input type="submit" value="Add Scope" class="input_button">
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/added_ngi.php b/htdocs/web_portal/views/admin/added_ngi.php
index 1b1c94b1a..ebf8ecbcc 100644
--- a/htdocs/web_portal/views/admin/added_ngi.php
+++ b/htdocs/web_portal/views/admin/added_ngi.php
@@ -12,4 +12,3 @@
     this smaller image should not exceed width:28px, height:25px.
 
 </div>
-
diff --git a/htdocs/web_portal/views/admin/added_project.php b/htdocs/web_portal/views/admin/added_project.php
index 8e8743e81..c7e3c87b3 100644
--- a/htdocs/web_portal/views/admin/added_project.php
+++ b/htdocs/web_portal/views/admin/added_project.php
@@ -10,4 +10,3 @@
 
 
 </div>
-
diff --git a/htdocs/web_portal/views/admin/added_scope.php b/htdocs/web_portal/views/admin/added_scope.php
index abaa46cb1..83e541679 100644
--- a/htdocs/web_portal/views/admin/added_scope.php
+++ b/htdocs/web_portal/views/admin/added_scope.php
@@ -9,4 +9,3 @@
 
 
 </div>
-
diff --git a/htdocs/web_portal/views/admin/delete_ngi.php b/htdocs/web_portal/views/admin/delete_ngi.php
index 491979ad2..4d145d9a5 100644
--- a/htdocs/web_portal/views/admin/delete_ngi.php
+++ b/htdocs/web_portal/views/admin/delete_ngi.php
@@ -50,4 +50,4 @@
         <input type="submit" value="Remove this NGI and all its associated sites and services from GOCDB" class="input_button">
     </form>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/delete_scope_denied.php b/htdocs/web_portal/views/admin/delete_scope_denied.php
index 254eae0f0..5acfb70fa 100644
--- a/htdocs/web_portal/views/admin/delete_scope_denied.php
+++ b/htdocs/web_portal/views/admin/delete_scope_denied.php
@@ -64,4 +64,4 @@
         <input type="submit" value="Remove Scope which is currently in use" class="input_button">
     </form>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/delete_service_type_denied.php b/htdocs/web_portal/views/admin/delete_service_type_denied.php
index cde534411..170852f70 100644
--- a/htdocs/web_portal/views/admin/delete_service_type_denied.php
+++ b/htdocs/web_portal/views/admin/delete_service_type_denied.php
@@ -19,4 +19,4 @@
     <br>
     These services will need their service type changing before the
     service type can be deleted.
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/deleted_ngi.php b/htdocs/web_portal/views/admin/deleted_ngi.php
index 4feecbdf2..26940f665 100644
--- a/htdocs/web_portal/views/admin/deleted_ngi.php
+++ b/htdocs/web_portal/views/admin/deleted_ngi.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Deletion Successful</h1><br />
     The NGI '<?php xecho($params['Name'])?>' and any associated sites and services have been successfully removed from GOCDB
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/deleted_scope.php b/htdocs/web_portal/views/admin/deleted_scope.php
index 7d2a73d2a..67e485c50 100644
--- a/htdocs/web_portal/views/admin/deleted_scope.php
+++ b/htdocs/web_portal/views/admin/deleted_scope.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Deletion Successful</h1><br />
     The scope '<?php xecho($params['Name'])?>' has been successfully removed from GOCDB
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/deleted_service_type.php b/htdocs/web_portal/views/admin/deleted_service_type.php
index 59d610f58..242a0143c 100644
--- a/htdocs/web_portal/views/admin/deleted_service_type.php
+++ b/htdocs/web_portal/views/admin/deleted_service_type.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Deletion Successful</h1><br />
     The service type '<?php xecho($params['Name'])?>' has been successfully removed from GOCDB
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/edit_scope.php b/htdocs/web_portal/views/admin/edit_scope.php
index 821d2684b..2881c2ee9 100644
--- a/htdocs/web_portal/views/admin/edit_scope.php
+++ b/htdocs/web_portal/views/admin/edit_scope.php
@@ -13,4 +13,4 @@
         <br />
         <input type="submit" value="Submit Changes" class="input_button">
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/edit_user_identifier.php b/htdocs/web_portal/views/admin/edit_user_identifier.php
index 5bf878b65..95169c873 100644
--- a/htdocs/web_portal/views/admin/edit_user_identifier.php
+++ b/htdocs/web_portal/views/admin/edit_user_identifier.php
@@ -41,4 +41,4 @@
         <input class="input_input_hidden" type="hidden" name="identifierId" value="<?php echo $params['identifierId']; ?>" />
         <input type="submit" value="Update Identifier" class="input_button">
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/edited_scope.php b/htdocs/web_portal/views/admin/edited_scope.php
index 294bddc1e..141091791 100644
--- a/htdocs/web_portal/views/admin/edited_scope.php
+++ b/htdocs/web_portal/views/admin/edited_scope.php
@@ -19,4 +19,3 @@
 
     </p>
 </div>
-
diff --git a/htdocs/web_portal/views/admin/edited_user_identifier.php b/htdocs/web_portal/views/admin/edited_user_identifier.php
index 87b259864..e5bc53a98 100644
--- a/htdocs/web_portal/views/admin/edited_user_identifier.php
+++ b/htdocs/web_portal/views/admin/edited_user_identifier.php
@@ -6,5 +6,3 @@
         <?php xecho($params['Name'])?>
     </a> has been successfully updated.
 </div>
-
-
diff --git a/htdocs/web_portal/views/admin/edited_user_isadmin.php b/htdocs/web_portal/views/admin/edited_user_isadmin.php
index 7d31bb805..298ef3ba3 100644
--- a/htdocs/web_portal/views/admin/edited_user_isadmin.php
+++ b/htdocs/web_portal/views/admin/edited_user_isadmin.php
@@ -13,5 +13,3 @@
         Return to the users page.
     </a>
 </div>
-
-
diff --git a/htdocs/web_portal/views/admin/move_service_end_point.php b/htdocs/web_portal/views/admin/move_service_end_point.php
index 10f0183e8..32ca79c46 100644
--- a/htdocs/web_portal/views/admin/move_service_end_point.php
+++ b/htdocs/web_portal/views/admin/move_service_end_point.php
@@ -26,4 +26,4 @@
         <br>
         <input class="input_button" type="submit" value="Move Service" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php b/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php
index b258b32a4..23634b512 100644
--- a/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php
+++ b/htdocs/web_portal/views/admin/move_service_end_point_select_old_site.php
@@ -14,4 +14,4 @@
 
         <input class="input_button" type="submit" value="Move service from this site" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/move_site.php b/htdocs/web_portal/views/admin/move_site.php
index 73241db5c..0f30ae81e 100644
--- a/htdocs/web_portal/views/admin/move_site.php
+++ b/htdocs/web_portal/views/admin/move_site.php
@@ -26,4 +26,4 @@
         <br>
         <input class="input_button" type="submit" value="Move Site" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/move_site_select_old_ngi.php b/htdocs/web_portal/views/admin/move_site_select_old_ngi.php
index 6e2a279bc..432c3c734 100644
--- a/htdocs/web_portal/views/admin/move_site_select_old_ngi.php
+++ b/htdocs/web_portal/views/admin/move_site_select_old_ngi.php
@@ -14,4 +14,4 @@
 
         <input class="input_button" type="submit" value="Move Sites from this NGI" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/moved_service_end_point.php b/htdocs/web_portal/views/admin/moved_service_end_point.php
index d1a799006..4e4ded933 100644
--- a/htdocs/web_portal/views/admin/moved_service_end_point.php
+++ b/htdocs/web_portal/views/admin/moved_service_end_point.php
@@ -13,4 +13,4 @@
                 . "</a> ";
         }
     ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/admin/moved_site.php b/htdocs/web_portal/views/admin/moved_site.php
index 1374f4be5..f70d36f27 100644
--- a/htdocs/web_portal/views/admin/moved_site.php
+++ b/htdocs/web_portal/views/admin/moved_site.php
@@ -13,4 +13,4 @@
                 . "</a> ";
         }
     ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/downtime/add_downtime.php b/htdocs/web_portal/views/downtime/add_downtime.php
index 35508c0d2..50b255cb0 100644
--- a/htdocs/web_portal/views/downtime/add_downtime.php
+++ b/htdocs/web_portal/views/downtime/add_downtime.php
@@ -631,21 +631,3 @@ function getURLParameter(name) {
     }*/
 
 </script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/web_portal/views/downtime/added_downtime.php b/htdocs/web_portal/views/downtime/added_downtime.php
index 563515a0c..68ed49348 100644
--- a/htdocs/web_portal/views/downtime/added_downtime.php
+++ b/htdocs/web_portal/views/downtime/added_downtime.php
@@ -2,4 +2,4 @@
     <h1 class="Success">Success</h1><br />
     New Downtime successfully created. <br />
     <a href="index.php?Page_Type=Downtime&amp;id=<?php echo $params['dt']->getId() ?>">View new downtime</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/downtime/confirm_add_downtime.php b/htdocs/web_portal/views/downtime/confirm_add_downtime.php
index 6ecebd831..84583afb1 100644
--- a/htdocs/web_portal/views/downtime/confirm_add_downtime.php
+++ b/htdocs/web_portal/views/downtime/confirm_add_downtime.php
@@ -99,4 +99,3 @@
         <?php endif;?>
     </form>
 </div>
-
diff --git a/htdocs/web_portal/views/downtime/custom_json_encode.php b/htdocs/web_portal/views/downtime/custom_json_encode.php
index ed9ec8b2f..57dbac537 100644
--- a/htdocs/web_portal/views/downtime/custom_json_encode.php
+++ b/htdocs/web_portal/views/downtime/custom_json_encode.php
@@ -59,4 +59,4 @@ function __json_encode( $data ) {
         $json = strtolower(var_export( $data, true ));
     }
     return $json;
-}
\ No newline at end of file
+}
diff --git a/htdocs/web_portal/views/downtime/deleted_downtime.php b/htdocs/web_portal/views/downtime/deleted_downtime.php
index 7366bca59..d60c2efc9 100644
--- a/htdocs/web_portal/views/downtime/deleted_downtime.php
+++ b/htdocs/web_portal/views/downtime/deleted_downtime.php
@@ -3,4 +3,4 @@
     Downtime deleted.
     <br />
     <a href="index.php">Go Home</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/downtime/downtimes_calendar.php b/htdocs/web_portal/views/downtime/downtimes_calendar.php
index b3ad0e7c1..e46196e55 100644
--- a/htdocs/web_portal/views/downtime/downtimes_calendar.php
+++ b/htdocs/web_portal/views/downtime/downtimes_calendar.php
@@ -676,4 +676,4 @@ function updateDate(time) {
         changeViewMode();
 
     })
-</script>
\ No newline at end of file
+</script>
diff --git a/htdocs/web_portal/views/downtime/edited_downtime.php b/htdocs/web_portal/views/downtime/edited_downtime.php
index befc0212d..c9d94370f 100644
--- a/htdocs/web_portal/views/downtime/edited_downtime.php
+++ b/htdocs/web_portal/views/downtime/edited_downtime.php
@@ -3,4 +3,4 @@
     Downtime updated. <br />
     <a href="index.php?Page_Type=Downtime&amp;id=<?php echo $params['dt']->getId() ?>">
     View downtime</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/downtime/ended_downtime.php b/htdocs/web_portal/views/downtime/ended_downtime.php
index 32932746b..049cab3dd 100644
--- a/htdocs/web_portal/views/downtime/ended_downtime.php
+++ b/htdocs/web_portal/views/downtime/ended_downtime.php
@@ -3,4 +3,4 @@
     Downtime will end within the next 60 seconds.<br />
     <a href="index.php?Page_Type=Downtime&amp;id=<?php echo $params['downtime']->getId() ?>">
     View downtime</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/error.php b/htdocs/web_portal/views/error.php
index 0f9dd5898..d7dea0975 100644
--- a/htdocs/web_portal/views/error.php
+++ b/htdocs/web_portal/views/error.php
@@ -10,4 +10,4 @@
     }
 
     ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/exportProperties.php b/htdocs/web_portal/views/exportProperties.php
index e3ddb11d5..6bb7bcde1 100644
--- a/htdocs/web_portal/views/exportProperties.php
+++ b/htdocs/web_portal/views/exportProperties.php
@@ -6,4 +6,3 @@
     echo(PHP_EOL);
 }
 ?>
-
diff --git a/htdocs/web_portal/views/my_sites.php b/htdocs/web_portal/views/my_sites.php
index 36428d88f..938ccfd8e 100644
--- a/htdocs/web_portal/views/my_sites.php
+++ b/htdocs/web_portal/views/my_sites.php
@@ -93,4 +93,3 @@
         </div>
     </div>
 </div>
-
diff --git a/htdocs/web_portal/views/ngi/edit_ngi.php b/htdocs/web_portal/views/ngi/edit_ngi.php
index ceefa63d3..49f86dbbb 100644
--- a/htdocs/web_portal/views/ngi/edit_ngi.php
+++ b/htdocs/web_portal/views/ngi/edit_ngi.php
@@ -85,4 +85,4 @@
         '#optionalScopeCheckBoxDIV',
         true);
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/htdocs/web_portal/views/ngi/ngi_updated.php b/htdocs/web_portal/views/ngi/ngi_updated.php
index 5a4062123..24212102f 100644
--- a/htdocs/web_portal/views/ngi/ngi_updated.php
+++ b/htdocs/web_portal/views/ngi/ngi_updated.php
@@ -3,4 +3,4 @@
     NGI updated. <br />
     <a href="index.php?Page_Type=NGI&amp;id=<?php echo $params['ngi']->getId() ?>">
     View NGI</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/political_role/new_request.php b/htdocs/web_portal/views/political_role/new_request.php
index 88a3e43b3..735041563 100644
--- a/htdocs/web_portal/views/political_role/new_request.php
+++ b/htdocs/web_portal/views/political_role/new_request.php
@@ -3,4 +3,4 @@
     <br />
     Role requested - View your pending role requests on the <a href="index.php?Page_Type=Role_Requests">Manage Roles</a> page.
     <br />
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/political_role/request_accepted.php b/htdocs/web_portal/views/political_role/request_accepted.php
index 791bacc4c..2c5f8868a 100644
--- a/htdocs/web_portal/views/political_role/request_accepted.php
+++ b/htdocs/web_portal/views/political_role/request_accepted.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1>Success</h1>
     Role request accepted
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/political_role/request_denied.php b/htdocs/web_portal/views/political_role/request_denied.php
index b819527c9..dbbaf4c80 100644
--- a/htdocs/web_portal/views/political_role/request_denied.php
+++ b/htdocs/web_portal/views/political_role/request_denied.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1>Success</h1>
     Role request denied
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/political_role/request_role.php b/htdocs/web_portal/views/political_role/request_role.php
index ed2042dd3..f34fe4f22 100644
--- a/htdocs/web_portal/views/political_role/request_role.php
+++ b/htdocs/web_portal/views/political_role/request_role.php
@@ -22,4 +22,4 @@
         <input type="hidden" name="Object_ID" value="<?php echo $params['objectId'] ?>"/>
         <input type="submit" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/political_role/role_revoked.php b/htdocs/web_portal/views/political_role/role_revoked.php
index 5faf0864b..7174ce985 100644
--- a/htdocs/web_portal/views/political_role/role_revoked.php
+++ b/htdocs/web_portal/views/political_role/role_revoked.php
@@ -4,4 +4,3 @@
     <br>
     <a href="index.php?Page_Type=Role_Requests">Back to Manage Role Requests</a>
 </div>
-
diff --git a/htdocs/web_portal/views/political_role/role_self_revoked.php b/htdocs/web_portal/views/political_role/role_self_revoked.php
index 2a2d894a8..7a2149456 100644
--- a/htdocs/web_portal/views/political_role/role_self_revoked.php
+++ b/htdocs/web_portal/views/political_role/role_self_revoked.php
@@ -4,4 +4,3 @@
     <br>
     <a href="index.php?Page_Type=Role_Requests">Back to Manage Role Requests</a>
 </div>
-
diff --git a/htdocs/web_portal/views/project/add_ngis.php b/htdocs/web_portal/views/project/add_ngis.php
index e787e3bde..89d6bb021 100644
--- a/htdocs/web_portal/views/project/add_ngis.php
+++ b/htdocs/web_portal/views/project/add_ngis.php
@@ -40,4 +40,3 @@
         </div>
     </div>
 </div>
-
diff --git a/htdocs/web_portal/views/project/added_ngis.php b/htdocs/web_portal/views/project/added_ngis.php
index 25c7eb159..f61f5747d 100644
--- a/htdocs/web_portal/views/project/added_ngis.php
+++ b/htdocs/web_portal/views/project/added_ngis.php
@@ -12,4 +12,4 @@
                 . "</a> ";
         }
     ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/project/deleted_project.php b/htdocs/web_portal/views/project/deleted_project.php
index bc0604de3..589f33aa3 100644
--- a/htdocs/web_portal/views/project/deleted_project.php
+++ b/htdocs/web_portal/views/project/deleted_project.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Deletion Successful</h1><br />
     The project '<?php xecho($params['Name'])?>' has been successfully removed from GOCDB
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/project/edit_project.php b/htdocs/web_portal/views/project/edit_project.php
index de5f05fd6..9b38a9725 100644
--- a/htdocs/web_portal/views/project/edit_project.php
+++ b/htdocs/web_portal/views/project/edit_project.php
@@ -13,4 +13,4 @@
         <br />
         <input type="submit" value="Submit Changes" class="input_button">
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/project/edited_project.php b/htdocs/web_portal/views/project/edited_project.php
index 9057a631d..855043a98 100644
--- a/htdocs/web_portal/views/project/edited_project.php
+++ b/htdocs/web_portal/views/project/edited_project.php
@@ -15,5 +15,3 @@
 
     </p>
 </div>
-
-
diff --git a/htdocs/web_portal/views/project/remove_ngis.php b/htdocs/web_portal/views/project/remove_ngis.php
index 4d165ca87..2f7c63670 100644
--- a/htdocs/web_portal/views/project/remove_ngis.php
+++ b/htdocs/web_portal/views/project/remove_ngis.php
@@ -35,4 +35,3 @@
         </div>
     </div>
 </div>
-
diff --git a/htdocs/web_portal/views/project/removed_ngis.php b/htdocs/web_portal/views/project/removed_ngis.php
index fa5518ef9..ee6f05456 100644
--- a/htdocs/web_portal/views/project/removed_ngis.php
+++ b/htdocs/web_portal/views/project/removed_ngis.php
@@ -4,4 +4,4 @@
     <a href="index.php?Page_Type=Project&amp;id=<?php echo $params['ID']?>">
     <?php xecho($params['Name']);?>
     </a> project
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/add_endpoint_properties.php b/htdocs/web_portal/views/service/add_endpoint_properties.php
index 17e4612ac..a981edfbd 100644
--- a/htdocs/web_portal/views/service/add_endpoint_properties.php
+++ b/htdocs/web_portal/views/service/add_endpoint_properties.php
@@ -7,4 +7,4 @@
 
     <?php require_once __DIR__ . '/../fragments/addPropertiesView.php';?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/add_endpoint_properties_confirmation.php b/htdocs/web_portal/views/service/add_endpoint_properties_confirmation.php
index b318672bb..9c7b933c8 100644
--- a/htdocs/web_portal/views/service/add_endpoint_properties_confirmation.php
+++ b/htdocs/web_portal/views/service/add_endpoint_properties_confirmation.php
@@ -7,4 +7,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Add Endpoint Properties</h1><br/>
     <?php require_once __DIR__ . '/../fragments/addPropertiesConfirmation.php';?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/add_service_properties.php b/htdocs/web_portal/views/service/add_service_properties.php
index 50da4216a..3fe624d24 100644
--- a/htdocs/web_portal/views/service/add_service_properties.php
+++ b/htdocs/web_portal/views/service/add_service_properties.php
@@ -7,4 +7,4 @@
 
     <?php require_once __DIR__ . '/../fragments/addPropertiesView.php';?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/add_service_properties_confirmation.php b/htdocs/web_portal/views/service/add_service_properties_confirmation.php
index cf2f7e9e4..0e4115b1f 100644
--- a/htdocs/web_portal/views/service/add_service_properties_confirmation.php
+++ b/htdocs/web_portal/views/service/add_service_properties_confirmation.php
@@ -7,4 +7,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Add Service Properties</h1><br/>
     <?php require_once __DIR__ . '/../fragments/addPropertiesConfirmation.php';?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/added_endpoint_properties.php b/htdocs/web_portal/views/service/added_endpoint_properties.php
index 74b93f9b5..a008464f6 100644
--- a/htdocs/web_portal/views/service/added_endpoint_properties.php
+++ b/htdocs/web_portal/views/service/added_endpoint_properties.php
@@ -10,4 +10,4 @@
 
     <a href="index.php?Page_Type=View_Service_Endpoint&amp;id=<?php echo $parent->getID(); ?>">
         View endpoint</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/added_service_properties.php b/htdocs/web_portal/views/service/added_service_properties.php
index a62361886..d35e773c9 100644
--- a/htdocs/web_portal/views/service/added_service_properties.php
+++ b/htdocs/web_portal/views/service/added_service_properties.php
@@ -10,4 +10,4 @@
 
     <a href="index.php?Page_Type=Service&amp;id=<?php echo $parent->getID(); ?>">
     View service</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/delete_service_endpoint.php b/htdocs/web_portal/views/service/delete_service_endpoint.php
index ef8cbdf7c..46694dbd5 100644
--- a/htdocs/web_portal/views/service/delete_service_endpoint.php
+++ b/htdocs/web_portal/views/service/delete_service_endpoint.php
@@ -20,4 +20,4 @@
         <input type="submit" value="Remove this endpoint from GOCDB" class="input_button">
     </form>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/deleted_endpoint_properties.php b/htdocs/web_portal/views/service/deleted_endpoint_properties.php
index 11517b36e..91401ad01 100644
--- a/htdocs/web_portal/views/service/deleted_endpoint_properties.php
+++ b/htdocs/web_portal/views/service/deleted_endpoint_properties.php
@@ -17,4 +17,4 @@
         <a href="index.php?Page_Type=View_Service_Endpoint&amp;id=<?php echo $endpoint->getId();?>">View endpoint</a>
     </p>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/deleted_service_endpoint.php b/htdocs/web_portal/views/service/deleted_service_endpoint.php
index ff5ba8d37..2290a4b5d 100644
--- a/htdocs/web_portal/views/service/deleted_service_endpoint.php
+++ b/htdocs/web_portal/views/service/deleted_service_endpoint.php
@@ -15,4 +15,4 @@
     View service</a>
     </p>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/deleted_service_properties.php b/htdocs/web_portal/views/service/deleted_service_properties.php
index 93a6623e7..cd9783e19 100644
--- a/htdocs/web_portal/views/service/deleted_service_properties.php
+++ b/htdocs/web_portal/views/service/deleted_service_properties.php
@@ -17,4 +17,4 @@
         <a href="index.php?Page_Type=Service&amp;id=<?php echo $service->getId();?>">View service</a>
     </p>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/edit_endpoint_property.php b/htdocs/web_portal/views/service/edit_endpoint_property.php
index 4386ff6f2..1416599ad 100644
--- a/htdocs/web_portal/views/service/edit_endpoint_property.php
+++ b/htdocs/web_portal/views/service/edit_endpoint_property.php
@@ -22,4 +22,4 @@
 
         <input class="input_button" type="submit" value="Edit Endpoint Property" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/edit_service_property.php b/htdocs/web_portal/views/service/edit_service_property.php
index f4f193a53..a32f7c619 100644
--- a/htdocs/web_portal/views/service/edit_service_property.php
+++ b/htdocs/web_portal/views/service/edit_service_property.php
@@ -21,4 +21,4 @@
 
         <input class="input_button" type="submit" value="Edit Service Property" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/endpoint_property_updated.php b/htdocs/web_portal/views/service/endpoint_property_updated.php
index af8920e57..2800419b1 100644
--- a/htdocs/web_portal/views/service/endpoint_property_updated.php
+++ b/htdocs/web_portal/views/service/endpoint_property_updated.php
@@ -3,4 +3,4 @@
     Endpoint Property updated.<br />
     <a href="index.php?Page_Type=View_Service_Endpoint&amp;id=<?php echo $params['endpointid']; ?>">
     View endpoint</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/service_deleted.php b/htdocs/web_portal/views/service/service_deleted.php
index d0d32aadb..7aab00e81 100644
--- a/htdocs/web_portal/views/service/service_deleted.php
+++ b/htdocs/web_portal/views/service/service_deleted.php
@@ -3,4 +3,4 @@
     Service deleted.
     <br />
     <a href="index.php">Go Home</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/service_endpoint_updated.php b/htdocs/web_portal/views/service/service_endpoint_updated.php
index 38e14d4b6..741318c8c 100644
--- a/htdocs/web_portal/views/service/service_endpoint_updated.php
+++ b/htdocs/web_portal/views/service/service_endpoint_updated.php
@@ -6,4 +6,4 @@
     <br>
     <a href="index.php?Page_Type=Service&amp;id=<?php echo $params['serviceid'] ?>">
     View Service </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/service_property_updated.php b/htdocs/web_portal/views/service/service_property_updated.php
index e960f5c4f..e810d2eb4 100644
--- a/htdocs/web_portal/views/service/service_property_updated.php
+++ b/htdocs/web_portal/views/service/service_property_updated.php
@@ -3,4 +3,4 @@
     Service Property updated.<br />
     <a href="index.php?Page_Type=Service&amp;id=<?php echo $params['serviceid']; ?>">
     View service</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/service_updated.php b/htdocs/web_portal/views/service/service_updated.php
index 2dbf7753e..c663f09dd 100644
--- a/htdocs/web_portal/views/service/service_updated.php
+++ b/htdocs/web_portal/views/service/service_updated.php
@@ -3,4 +3,4 @@
     Service updated. <br />
     <a href="index.php?Page_Type=Service&amp;id=<?php echo $params['se']->getId() ?>">
     View service </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service/submit_add_service.php b/htdocs/web_portal/views/service/submit_add_service.php
index 674eb6cb8..d07c9eefe 100644
--- a/htdocs/web_portal/views/service/submit_add_service.php
+++ b/htdocs/web_portal/views/service/submit_add_service.php
@@ -3,4 +3,4 @@
     New Service successfully created. <br />
     <a href="index.php?Page_Type=Service&amp;id=<?php echo $params['se']->getId() ?>">
     View new service</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/add_new_se_to_service_group.php b/htdocs/web_portal/views/service_group/add_new_se_to_service_group.php
index 0a42a4cba..7ba03c24d 100644
--- a/htdocs/web_portal/views/service_group/add_new_se_to_service_group.php
+++ b/htdocs/web_portal/views/service_group/add_new_se_to_service_group.php
@@ -103,4 +103,4 @@
         <br />
         <input class="input_button" type="submit" value="Execute" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/add_service_group.php b/htdocs/web_portal/views/service_group/add_service_group.php
index 0cbfbc74c..26d9efc7e 100644
--- a/htdocs/web_portal/views/service_group/add_service_group.php
+++ b/htdocs/web_portal/views/service_group/add_service_group.php
@@ -53,4 +53,4 @@
           '#optionalScopeCheckBoxDIV',
           true);
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/htdocs/web_portal/views/service_group/add_service_group_properties.php b/htdocs/web_portal/views/service_group/add_service_group_properties.php
index aa7a76004..2a30bf862 100644
--- a/htdocs/web_portal/views/service_group/add_service_group_properties.php
+++ b/htdocs/web_portal/views/service_group/add_service_group_properties.php
@@ -7,4 +7,4 @@
 
     <?php require_once __DIR__ . '/../fragments/addPropertiesView.php';?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/add_service_group_properties_confirmation.php b/htdocs/web_portal/views/service_group/add_service_group_properties_confirmation.php
index 520b921c2..700498b21 100644
--- a/htdocs/web_portal/views/service_group/add_service_group_properties_confirmation.php
+++ b/htdocs/web_portal/views/service_group/add_service_group_properties_confirmation.php
@@ -7,4 +7,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Add Service Group Properties</h1><br/>
     <?php require_once __DIR__ . '/../fragments/addPropertiesConfirmation.php';?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/added_service_group_properties.php b/htdocs/web_portal/views/service_group/added_service_group_properties.php
index ee0d1cd24..4b16eda0e 100644
--- a/htdocs/web_portal/views/service_group/added_service_group_properties.php
+++ b/htdocs/web_portal/views/service_group/added_service_group_properties.php
@@ -10,4 +10,4 @@
 
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $parent->getID(); ?>">
         View service group</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/deleted_service_group.php b/htdocs/web_portal/views/service_group/deleted_service_group.php
index 195abc534..a024a47f8 100644
--- a/htdocs/web_portal/views/service_group/deleted_service_group.php
+++ b/htdocs/web_portal/views/service_group/deleted_service_group.php
@@ -3,4 +3,4 @@
     Service Group deleted.
     <br />
     <a href="index.php">Go Home</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/deleted_service_group_properties.php b/htdocs/web_portal/views/service_group/deleted_service_group_properties.php
index 287dfff32..e25f66d25 100644
--- a/htdocs/web_portal/views/service_group/deleted_service_group_properties.php
+++ b/htdocs/web_portal/views/service_group/deleted_service_group_properties.php
@@ -17,4 +17,4 @@
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $serviceGroup->getId();?>">View service group</a>
     </p>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/edit_service_group_property.php b/htdocs/web_portal/views/service_group/edit_service_group_property.php
index af8702b34..5f6106bd1 100644
--- a/htdocs/web_portal/views/service_group/edit_service_group_property.php
+++ b/htdocs/web_portal/views/service_group/edit_service_group_property.php
@@ -21,4 +21,4 @@
 
         <input class="input_button" type="submit" value="Edit Service Group Property" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/return_removed_se.php b/htdocs/web_portal/views/service_group/return_removed_se.php
index d60de058b..6aade1f51 100644
--- a/htdocs/web_portal/views/service_group/return_removed_se.php
+++ b/htdocs/web_portal/views/service_group/return_removed_se.php
@@ -1,2 +1,2 @@
 <?php
-echo $params['se']->getId();
\ No newline at end of file
+echo $params['se']->getId();
diff --git a/htdocs/web_portal/views/service_group/se_search.php b/htdocs/web_portal/views/service_group/se_search.php
index f3ccad330..d3e613003 100644
--- a/htdocs/web_portal/views/service_group/se_search.php
+++ b/htdocs/web_portal/views/service_group/se_search.php
@@ -1,4 +1,4 @@
 <?php
 /* Returns a JSON formatted list of SEs that match the search term provided */
 echo json_encode($params ['ses']);
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/web_portal/views/service_group/service_group_property_updated.php b/htdocs/web_portal/views/service_group/service_group_property_updated.php
index ec462f00e..197cc1ab5 100644
--- a/htdocs/web_portal/views/service_group/service_group_property_updated.php
+++ b/htdocs/web_portal/views/service_group/service_group_property_updated.php
@@ -3,4 +3,4 @@
     Service Group Property updated.<br />
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $params['serviceGroupId']; ?>">
     View service group</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/submit_add_new_se_to_service_group.php b/htdocs/web_portal/views/service_group/submit_add_new_se_to_service_group.php
index 9bf9d0d7a..871ecb057 100644
--- a/htdocs/web_portal/views/service_group/submit_add_new_se_to_service_group.php
+++ b/htdocs/web_portal/views/service_group/submit_add_new_se_to_service_group.php
@@ -3,4 +3,4 @@
     New Service successfully created and added to service group <?php xecho($params['vSite']['NAME']) ?>. <br />
     <a href="index.php?Page_Type=View_Object&object_id=<?php echo $params['vSite']['COBJECTID'] ?>&amp;grid_id=0">
     View service group</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/submit_add_service_group.php b/htdocs/web_portal/views/service_group/submit_add_service_group.php
index 0607b00f8..2ae41ff91 100644
--- a/htdocs/web_portal/views/service_group/submit_add_service_group.php
+++ b/htdocs/web_portal/views/service_group/submit_add_service_group.php
@@ -3,4 +3,4 @@
     New Service group <?php xecho($params['sg']->getName()) ?> successfully created. <br />
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $params['sg']->getId() ?>">
     View <?php xecho($params['sg']->getName()) ?></a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/submit_edited_service_group.php b/htdocs/web_portal/views/service_group/submit_edited_service_group.php
index 2276b3f11..2ef747926 100644
--- a/htdocs/web_portal/views/service_group/submit_edited_service_group.php
+++ b/htdocs/web_portal/views/service_group/submit_edited_service_group.php
@@ -3,4 +3,4 @@
     Service group <?php xecho($params['serviceGroup']->getName()) ?> successfully edited. <br />
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $params['serviceGroup']->getId() ?>">
     View <?php xecho($params['serviceGroup']->getName()) ?></a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/service_group/submit_service_group_ses.php b/htdocs/web_portal/views/service_group/submit_service_group_ses.php
index c5bce2704..ff5f9409d 100644
--- a/htdocs/web_portal/views/service_group/submit_service_group_ses.php
+++ b/htdocs/web_portal/views/service_group/submit_service_group_ses.php
@@ -3,4 +3,4 @@
     Services successfully added to service group.<br />
     <a href="index.php?Page_Type=Service_Group&amp;id=<?php echo $params['sg']->getId() ?>">
     View service group</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/add_site_properties.php b/htdocs/web_portal/views/site/add_site_properties.php
index 3969a142f..98c125b1a 100644
--- a/htdocs/web_portal/views/site/add_site_properties.php
+++ b/htdocs/web_portal/views/site/add_site_properties.php
@@ -7,4 +7,4 @@
 
     <?php require_once __DIR__ . '/../fragments/addPropertiesView.php';?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/add_site_properties_confirmation.php b/htdocs/web_portal/views/site/add_site_properties_confirmation.php
index b6e82d260..f0a42b79d 100644
--- a/htdocs/web_portal/views/site/add_site_properties_confirmation.php
+++ b/htdocs/web_portal/views/site/add_site_properties_confirmation.php
@@ -7,4 +7,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Add Site Properties</h1><br/>
     <?php require_once __DIR__ . '/../fragments/addPropertiesConfirmation.php';?>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/add_site_property.php b/htdocs/web_portal/views/site/add_site_property.php
index 1cfae18fc..055b9609e 100644
--- a/htdocs/web_portal/views/site/add_site_property.php
+++ b/htdocs/web_portal/views/site/add_site_property.php
@@ -19,4 +19,4 @@
 
         <input class="input_button" type="submit" value="Add Site Property" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/added_site_properties.php b/htdocs/web_portal/views/site/added_site_properties.php
index bdf7af744..c3feb8c02 100644
--- a/htdocs/web_portal/views/site/added_site_properties.php
+++ b/htdocs/web_portal/views/site/added_site_properties.php
@@ -10,4 +10,4 @@
 
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $parent->getID(); ?>">
         View site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/added_site_property.php b/htdocs/web_portal/views/site/added_site_property.php
index ef1bda414..a3677f099 100644
--- a/htdocs/web_portal/views/site/added_site_property.php
+++ b/htdocs/web_portal/views/site/added_site_property.php
@@ -3,4 +3,4 @@
     New site property successfully created. <br />
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $params ?>">
     View site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/cert_status_edited.php b/htdocs/web_portal/views/site/cert_status_edited.php
index 545826e7f..006d29379 100644
--- a/htdocs/web_portal/views/site/cert_status_edited.php
+++ b/htdocs/web_portal/views/site/cert_status_edited.php
@@ -3,4 +3,4 @@
     Certification status updated. <br />
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $params['site']->getId() ?>">
     View site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/delete_site.php b/htdocs/web_portal/views/site/delete_site.php
index 0c4f2d75f..ed078722a 100644
--- a/htdocs/web_portal/views/site/delete_site.php
+++ b/htdocs/web_portal/views/site/delete_site.php
@@ -37,4 +37,4 @@
         <input type="submit" value="Remove this site and all its associated services from GOCDB" class="input_button">
     </form>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/deleted_site.php b/htdocs/web_portal/views/site/deleted_site.php
index 2fd602337..7398c7b3d 100644
--- a/htdocs/web_portal/views/site/deleted_site.php
+++ b/htdocs/web_portal/views/site/deleted_site.php
@@ -1,4 +1,4 @@
 <div class="rightPageContainer">
     <h1 class="Success">Deletion Successful</h1><br />
     The site '<?php echo $params['Name']?>' and any associated services have been successfully removed from GOCDB
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/deleted_site_properties.php b/htdocs/web_portal/views/site/deleted_site_properties.php
index 8f68172f6..d9d6ebde4 100644
--- a/htdocs/web_portal/views/site/deleted_site_properties.php
+++ b/htdocs/web_portal/views/site/deleted_site_properties.php
@@ -17,4 +17,4 @@
         <a href="index.php?Page_Type=Site&amp;id=<?php echo $site->getId();?>">View Site</a>
     </p>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/edit_cert_status.php b/htdocs/web_portal/views/site/edit_cert_status.php
index 2b9ebd162..09ef38a21 100644
--- a/htdocs/web_portal/views/site/edit_cert_status.php
+++ b/htdocs/web_portal/views/site/edit_cert_status.php
@@ -28,4 +28,4 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/edit_site_property.php b/htdocs/web_portal/views/site/edit_site_property.php
index a5feb1e96..75f43f40c 100644
--- a/htdocs/web_portal/views/site/edit_site_property.php
+++ b/htdocs/web_portal/views/site/edit_site_property.php
@@ -21,4 +21,4 @@
 
         <input class="input_button" type="submit" value="Edit Site Property" />
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/site_property_updated.php b/htdocs/web_portal/views/site/site_property_updated.php
index 1d2511eee..7601d8e30 100644
--- a/htdocs/web_portal/views/site/site_property_updated.php
+++ b/htdocs/web_portal/views/site/site_property_updated.php
@@ -3,4 +3,4 @@
     Site Property updated.<br />
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $params['siteid']; ?>">
     View site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/site_updated.php b/htdocs/web_portal/views/site/site_updated.php
index c597f8166..d778b12a7 100644
--- a/htdocs/web_portal/views/site/site_updated.php
+++ b/htdocs/web_portal/views/site/site_updated.php
@@ -3,4 +3,4 @@
     Site updated. <br />
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $params['site']->getId() ?>">
     View site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/site/submit_new_site.php b/htdocs/web_portal/views/site/submit_new_site.php
index 9cdf4062f..45cb5e38c 100644
--- a/htdocs/web_portal/views/site/submit_new_site.php
+++ b/htdocs/web_portal/views/site/submit_new_site.php
@@ -3,4 +3,4 @@
     New Site successfully created. <br />
     <a href="index.php?Page_Type=Site&amp;id=<?php echo $params['site']->getId() ?>">
     View new site</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/deleted_user.php b/htdocs/web_portal/views/user/deleted_user.php
index e55bcc510..cfcfbdb30 100644
--- a/htdocs/web_portal/views/user/deleted_user.php
+++ b/htdocs/web_portal/views/user/deleted_user.php
@@ -3,4 +3,4 @@
     User deleted.
     <br />
     <a href="index.php">Go Home</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/deleted_user_identifier.php b/htdocs/web_portal/views/user/deleted_user_identifier.php
index 34f79f761..a6a5141f3 100644
--- a/htdocs/web_portal/views/user/deleted_user_identifier.php
+++ b/htdocs/web_portal/views/user/deleted_user_identifier.php
@@ -4,4 +4,4 @@
     <a href="index.php?Page_Type=User&amp;id=<?php echo $params['ID']?>">
         View user
     </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/link_identity.php b/htdocs/web_portal/views/user/link_identity.php
index 2588e53da..ff5513281 100644
--- a/htdocs/web_portal/views/user/link_identity.php
+++ b/htdocs/web_portal/views/user/link_identity.php
@@ -158,4 +158,3 @@ class="form-control"
 </style>
 
 <script type="text/javascript" src="<?php echo \GocContextPath::getPath(); ?>javascript/linking.js"></script>
-
diff --git a/htdocs/web_portal/views/user/link_identity_accepted.php b/htdocs/web_portal/views/user/link_identity_accepted.php
index 2d144c51e..2a05753ac 100644
--- a/htdocs/web_portal/views/user/link_identity_accepted.php
+++ b/htdocs/web_portal/views/user/link_identity_accepted.php
@@ -14,4 +14,4 @@
 
     <p>If you did not receive an email, please check the above details are correct, and the
     <a href="index.php?Page_Type=Link_Identity">guidance on identity linking and account recovery</a>.</p>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/link_identity_rejected.php b/htdocs/web_portal/views/user/link_identity_rejected.php
index 471632323..58d7995fb 100644
--- a/htdocs/web_portal/views/user/link_identity_rejected.php
+++ b/htdocs/web_portal/views/user/link_identity_rejected.php
@@ -17,4 +17,4 @@
     please unlink all other identifiers first.</p>
     <p>If you wish to add new identifiers to this account, please
     access GOCDB while authenticated with the new identifier.</p>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/linked_identity.php b/htdocs/web_portal/views/user/linked_identity.php
index 34a0ce3e7..598ef24e0 100644
--- a/htdocs/web_portal/views/user/linked_identity.php
+++ b/htdocs/web_portal/views/user/linked_identity.php
@@ -2,4 +2,4 @@
     <h1 class="Success">Success</h1>
     Your identifier has been <?php echo $params['requestText']; ?> successfully
     <br />
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/registered.php b/htdocs/web_portal/views/user/registered.php
index a23ab75e4..8cd1cfd9b 100644
--- a/htdocs/web_portal/views/user/registered.php
+++ b/htdocs/web_portal/views/user/registered.php
@@ -6,4 +6,4 @@
     New user registered. <br />
     <a href="index.php?Page_Type=User&amp;id=<?php echo $user->getId() ?>">
     View user</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/htdocs/web_portal/views/user/user_updated.php b/htdocs/web_portal/views/user/user_updated.php
index 5da2449be..56dc7e87e 100644
--- a/htdocs/web_portal/views/user/user_updated.php
+++ b/htdocs/web_portal/views/user/user_updated.php
@@ -3,4 +3,4 @@
     User updated. <br />
     <a href="index.php?Page_Type=User&amp;id=<?php echo $params['user']->getId() ?>">
     View user</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/Authentication/_autoload.php b/lib/Authentication/_autoload.php
index bed78a5a8..1e1ca4e7a 100644
--- a/lib/Authentication/_autoload.php
+++ b/lib/Authentication/_autoload.php
@@ -73,4 +73,3 @@ function securityLoader($className){
 
 
 spl_autoload_register(__NAMESPACE__ .'\securityLoader', false);
-
diff --git a/lib/DAOs/AbstractDAO.php b/lib/DAOs/AbstractDAO.php
index b80927402..894585518 100644
--- a/lib/DAOs/AbstractDAO.php
+++ b/lib/DAOs/AbstractDAO.php
@@ -25,4 +25,4 @@ public function setEntityManager(\Doctrine\ORM\EntityManager $em){
     public function getEntityManager(){
         return $this->em;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/DAOs/NGIDAO.php b/lib/DAOs/NGIDAO.php
index 168784e26..ee87cb3e6 100644
--- a/lib/DAOs/NGIDAO.php
+++ b/lib/DAOs/NGIDAO.php
@@ -51,4 +51,4 @@ public function addNGIToArchive(\NGI $ngi, \User $user){
 
         $this->em->persist($archievedNgi);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/CertificationStatus.php b/lib/Gocdb_Services/CertificationStatus.php
index 25252a6a9..0ad274572 100644
--- a/lib/Gocdb_Services/CertificationStatus.php
+++ b/lib/Gocdb_Services/CertificationStatus.php
@@ -160,4 +160,4 @@ public function isChangeValid(\Site $site, \CertificationStatus $newCertStatus)
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/Gocdb_Services/ExtensionsService.php b/lib/Gocdb_Services/ExtensionsService.php
index 7930a8d0d..c1f05643a 100644
--- a/lib/Gocdb_Services/ExtensionsService.php
+++ b/lib/Gocdb_Services/ExtensionsService.php
@@ -58,4 +58,4 @@ public function getServiceGroupExtensionsKeyNames() {
 
         return $qb->getQuery()->execute();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetCertStatusChanges.php b/lib/Gocdb_Services/PI/GetCertStatusChanges.php
index 70a25c889..4835c0644 100644
--- a/lib/Gocdb_Services/PI/GetCertStatusChanges.php
+++ b/lib/Gocdb_Services/PI/GetCertStatusChanges.php
@@ -354,4 +354,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetCertStatusDate.php b/lib/Gocdb_Services/PI/GetCertStatusDate.php
index ae3ad157b..e91f7c6cb 100644
--- a/lib/Gocdb_Services/PI/GetCertStatusDate.php
+++ b/lib/Gocdb_Services/PI/GetCertStatusDate.php
@@ -345,4 +345,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetNGIContacts.php b/lib/Gocdb_Services/PI/GetNGIContacts.php
index 254ac19d1..514eec313 100644
--- a/lib/Gocdb_Services/PI/GetNGIContacts.php
+++ b/lib/Gocdb_Services/PI/GetNGIContacts.php
@@ -362,4 +362,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetNGIList.php b/lib/Gocdb_Services/PI/GetNGIList.php
index 48cc2a768..92271e6e0 100644
--- a/lib/Gocdb_Services/PI/GetNGIList.php
+++ b/lib/Gocdb_Services/PI/GetNGIList.php
@@ -233,4 +233,4 @@ private function getXML(){
     }*/
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetProjectContacts.php b/lib/Gocdb_Services/PI/GetProjectContacts.php
index 56c5b017c..181eaf2b5 100644
--- a/lib/Gocdb_Services/PI/GetProjectContacts.php
+++ b/lib/Gocdb_Services/PI/GetProjectContacts.php
@@ -342,4 +342,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetServiceGroupRole.php b/lib/Gocdb_Services/PI/GetServiceGroupRole.php
index f8b05f1be..03d4a5bff 100644
--- a/lib/Gocdb_Services/PI/GetServiceGroupRole.php
+++ b/lib/Gocdb_Services/PI/GetServiceGroupRole.php
@@ -377,4 +377,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetServiceTypes.php b/lib/Gocdb_Services/PI/GetServiceTypes.php
index 5ff72e1ad..3588ea738 100644
--- a/lib/Gocdb_Services/PI/GetServiceTypes.php
+++ b/lib/Gocdb_Services/PI/GetServiceTypes.php
@@ -180,4 +180,4 @@ private function getXML(){
         return $xmlString;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetSiteContacts.php b/lib/Gocdb_Services/PI/GetSiteContacts.php
index f91e290d1..c6af53fc5 100644
--- a/lib/Gocdb_Services/PI/GetSiteContacts.php
+++ b/lib/Gocdb_Services/PI/GetSiteContacts.php
@@ -390,4 +390,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetSiteSecurityInfo.php b/lib/Gocdb_Services/PI/GetSiteSecurityInfo.php
index ac835bca2..73bc69d6b 100644
--- a/lib/Gocdb_Services/PI/GetSiteSecurityInfo.php
+++ b/lib/Gocdb_Services/PI/GetSiteSecurityInfo.php
@@ -353,4 +353,4 @@ public function getPostExecutionPageInfo(){
         $pageInfo['count'] = $this->resultSetSize;
         return $pageInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/GetSubGridList.php b/lib/Gocdb_Services/PI/GetSubGridList.php
index 083cedf55..ef2bac31d 100644
--- a/lib/Gocdb_Services/PI/GetSubGridList.php
+++ b/lib/Gocdb_Services/PI/GetSubGridList.php
@@ -175,4 +175,4 @@ private function getXML(){
         $xmlString = $dom->saveXML ();
         return $xmlString;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/IPIQueryPageable.php b/lib/Gocdb_Services/PI/IPIQueryPageable.php
index 7d2d0471f..89d56d6b3 100644
--- a/lib/Gocdb_Services/PI/IPIQueryPageable.php
+++ b/lib/Gocdb_Services/PI/IPIQueryPageable.php
@@ -56,4 +56,4 @@ public function setPageSize($pageSize);
      */
     public function getPostExecutionPageInfo();
 
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/PI/QueryBuilders/ExtensionsParser.php b/lib/Gocdb_Services/PI/QueryBuilders/ExtensionsParser.php
index 7b4e10c2b..1637694b7 100644
--- a/lib/Gocdb_Services/PI/QueryBuilders/ExtensionsParser.php
+++ b/lib/Gocdb_Services/PI/QueryBuilders/ExtensionsParser.php
@@ -161,4 +161,4 @@ private function checkLimit($parsedQueries){
             }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/Project.php b/lib/Gocdb_Services/Project.php
index 4dea41209..61e55ea29 100644
--- a/lib/Gocdb_Services/Project.php
+++ b/lib/Gocdb_Services/Project.php
@@ -468,5 +468,3 @@ private function validate($projectData) {
         }
     }
 }
-
-
diff --git a/lib/Gocdb_Services/Scope.php b/lib/Gocdb_Services/Scope.php
index 84eafd766..40ddca0ed 100644
--- a/lib/Gocdb_Services/Scope.php
+++ b/lib/Gocdb_Services/Scope.php
@@ -545,4 +545,4 @@ private function validate($scopeData, $scopeIsNew, $oldScopeName = '') {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Gocdb_Services/SecurityContextSource.php b/lib/Gocdb_Services/SecurityContextSource.php
index c2dc0a284..618fa8404 100644
--- a/lib/Gocdb_Services/SecurityContextSource.php
+++ b/lib/Gocdb_Services/SecurityContextSource.php
@@ -20,4 +20,3 @@ public static function getContext(){
         return self::$context;
     }
 }
-
diff --git a/lib/MonologConf.php b/lib/MonologConf.php
index 40915dcc4..4a69d2439 100644
--- a/lib/MonologConf.php
+++ b/lib/MonologConf.php
@@ -25,4 +25,3 @@
 
 // You can now use your logger
 $log1->addDebug('log1 is now ready');
-
diff --git a/resources/ApplyScopeTagsToSitesAndServicesRunner.php b/resources/ApplyScopeTagsToSitesAndServicesRunner.php
index 9f916206d..2971a4850 100644
--- a/resources/ApplyScopeTagsToSitesAndServicesRunner.php
+++ b/resources/ApplyScopeTagsToSitesAndServicesRunner.php
@@ -259,5 +259,3 @@
     $em->close();
     echo $e->getMessage();
 }
-
-
diff --git a/resources/QueryPopulateSSO_UsernameRunner.php b/resources/QueryPopulateSSO_UsernameRunner.php
index c420e1dfe..e3fae5a18 100644
--- a/resources/QueryPopulateSSO_UsernameRunner.php
+++ b/resources/QueryPopulateSSO_UsernameRunner.php
@@ -74,5 +74,3 @@
 function cleanDN($dn) {
     return trim(str_replace(' ', '%20', $dn));
 }
-
-
diff --git a/tests/miscTests/PI_Extensions_Param_ParsingTest.php b/tests/miscTests/PI_Extensions_Param_ParsingTest.php
index d3f57e511..4266529f7 100644
--- a/tests/miscTests/PI_Extensions_Param_ParsingTest.php
+++ b/tests/miscTests/PI_Extensions_Param_ParsingTest.php
@@ -793,5 +793,3 @@ public function test_ExensionsParser2() {
 
 
 }
-
-
diff --git a/tests/resources/QueryPI_GetXmlOutput.php b/tests/resources/QueryPI_GetXmlOutput.php
index dec30ad40..518f2ef2b 100644
--- a/tests/resources/QueryPI_GetXmlOutput.php
+++ b/tests/resources/QueryPI_GetXmlOutput.php
@@ -177,8 +177,3 @@
 else {
     echo "Error no valid arg given\n";
 }
-
-
-
-
-
diff --git a/unused_resources/ParseAtlasDataRunner.php b/unused_resources/ParseAtlasDataRunner.php
index 7161da8f1..b848607a0 100644
--- a/unused_resources/ParseAtlasDataRunner.php
+++ b/unused_resources/ParseAtlasDataRunner.php
@@ -51,4 +51,3 @@
 foreach($siteArray as $siteName){
     echo $siteName."\n";
 }
-