diff --git a/account_manage_columns_page.php b/account_manage_columns_page.php
index f332166577..8298b3b745 100644
--- a/account_manage_columns_page.php
+++ b/account_manage_columns_page.php
@@ -45,4 +45,3 @@
 	include ( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'manage_columns_inc.php' );
 
 	html_page_bottom( __FILE__ );
-?>
\ No newline at end of file
diff --git a/account_prefs_update.php b/account_prefs_update.php
index e757d88595..c8a25a1af6 100644
--- a/account_prefs_update.php
+++ b/account_prefs_update.php
@@ -111,4 +111,3 @@
 	print_bracket_link( $f_redirect_url, lang_get( 'proceed' ) );
 	echo '<br /></div>';
 	html_page_bottom( __FILE__ );
-?>
diff --git a/account_prof_menu_page.php b/account_prof_menu_page.php
index 5d87eda587..576ca0d361 100644
--- a/account_prof_menu_page.php
+++ b/account_prof_menu_page.php
@@ -177,4 +177,5 @@
 <?php } ?>
 <?php # Edit or Delete Profile Form END ?>
 
-<?php html_page_bottom( __FILE__ ) ?>
+<?php
+	html_page_bottom( __FILE__ );
diff --git a/account_update.php b/account_update.php
index b4c14b5624..06a03a1795 100644
--- a/account_update.php
+++ b/account_update.php
@@ -109,4 +109,3 @@
 	print_bracket_link( $t_redirect, lang_get( 'proceed' ) );
 	echo '</div>';
 	html_page_bottom( __FILE__ );
-?>
diff --git a/adm_permissions_report.php b/adm_permissions_report.php
index c3dd730fbb..939c2fd644 100644
--- a/adm_permissions_report.php
+++ b/adm_permissions_report.php
@@ -145,4 +145,3 @@ function get_section_end() {
 	echo get_section_end();
 
 	html_page_bottom( __FILE__ );
-?>
diff --git a/admin/check.php b/admin/check.php
index 160f1f081d..0859a574f4 100644
--- a/admin/check.php
+++ b/admin/check.php
@@ -20,7 +20,7 @@
  * @copyright Copyright (C) 2002 - 2009  MantisBT Team - mantisbt-dev@lists.sourceforge.net
  * @link http://www.mantisbt.org
  */
- 
+
 error_reporting( E_ALL );
 
 $g_skip_open_db = true;  # don't open the database in database_api.php
@@ -153,7 +153,7 @@ function check_zend_optimiser_version() {
 			if (!($t_version > ZEND_OPTIMIZER_VERSION) || ($t_version==ZEND_OPTIMIZER_VERSION && $t_subVersion>=ZEND_OPTIMIZER_SUBVERSION)) {
 				$t_pass = false;
 				$t_info = 'Fail - Installed Version: ' . $t_version . '.' . $t_subVersion . '.';
-			}	  
+			}
 		}
 	} else {
 		$t_info = 'Zend Optimiser not detected';
diff --git a/billing_inc.php b/billing_inc.php
index e2279004a2..f66701f5ce 100644
--- a/billing_inc.php
+++ b/billing_inc.php
@@ -194,4 +194,3 @@
 </table>
 <?php
 	collapse_end( 'bugnotestats' );
-?>
\ No newline at end of file
diff --git a/bug_actiongroup_add_note_inc.php b/bug_actiongroup_add_note_inc.php
index 3042b23b74..2a581f4983 100644
--- a/bug_actiongroup_add_note_inc.php
+++ b/bug_actiongroup_add_note_inc.php
@@ -106,4 +106,3 @@ function action_add_note_process( $p_bug_id ) {
 		bugnote_add ( $p_bug_id, $f_bugnote_text, '0:00', /* $p_private = */ $f_view_state != VS_PUBLIC  );
         return true;
     }
-?>
diff --git a/bug_actiongroup_page.php b/bug_actiongroup_page.php
index a1b6a1c11b..a754d561a6 100644
--- a/bug_actiongroup_page.php
+++ b/bug_actiongroup_page.php
@@ -361,4 +361,3 @@
 
 <?php
 	bug_group_action_print_bottom();
-?>
diff --git a/bug_actiongroup_update_product_build_inc.php b/bug_actiongroup_update_product_build_inc.php
index 5060b56473..a184a11680 100644
--- a/bug_actiongroup_update_product_build_inc.php
+++ b/bug_actiongroup_update_product_build_inc.php
@@ -79,4 +79,3 @@ function action_update_product_build_process( $p_bug_id ) {
 		bug_set_field( $p_bug_id, 'build', $t_build );
 		return true;
     }
-?>
diff --git a/bug_assign.php b/bug_assign.php
index 137fbd429e..2a2878a0c7 100644
--- a/bug_assign.php
+++ b/bug_assign.php
@@ -68,4 +68,3 @@
 	bug_assign( $f_bug_id, $f_handler_id );
 
 	print_successful_redirect_to_bug( $f_bug_id );
-?>
diff --git a/bug_assign_reporter.php b/bug_assign_reporter.php
index e16df48c22..f4825a3767 100644
--- a/bug_assign_reporter.php
+++ b/bug_assign_reporter.php
@@ -47,4 +47,3 @@
 	bug_assign( $f_bug_id, bug_get_field( $f_bug_id, 'reporter_id') );
 
 	print_successful_redirect_to_bug( $f_bug_id );
-?>
diff --git a/bug_file_delete.php b/bug_file_delete.php
index 82ba3cad42..caca1695cf 100644
--- a/bug_file_delete.php
+++ b/bug_file_delete.php
@@ -51,4 +51,3 @@
 	file_delete( $f_file_id, 'bug' );
 
 	print_header_redirect_view( $t_bug_id );
-?>
diff --git a/bug_file_upload_inc.php b/bug_file_upload_inc.php
index b1f8f85332..9bd36e3984 100644
--- a/bug_file_upload_inc.php
+++ b/bug_file_upload_inc.php
@@ -76,4 +76,3 @@
 
 <?php
 	collapse_end( 'upload_form' );
-?>
diff --git a/bug_graph_bycategory.php b/bug_graph_bycategory.php
index f437e2a524..e3335ae617 100644
--- a/bug_graph_bycategory.php
+++ b/bug_graph_bycategory.php
@@ -234,4 +234,3 @@
 	    array_unshift( $t_category, '' ); // add placeholder
 	    graph_bydate( $t_metrics, $t_category, lang_get( 'by_category' ), $f_width, $f_width * $t_ar );
     }
-?>
diff --git a/bug_monitor.php b/bug_monitor.php
index e5ec80a32c..49d467a75e 100644
--- a/bug_monitor.php
+++ b/bug_monitor.php
@@ -70,4 +70,3 @@
 	}
 
 	print_successful_redirect_to_bug( $f_bug_id );
-?>
diff --git a/bug_relationship_add.php b/bug_relationship_add.php
index 77c36e668f..b727dcdd49 100644
--- a/bug_relationship_add.php
+++ b/bug_relationship_add.php
@@ -106,4 +106,3 @@
 	}
 
 	print_header_redirect_view( $f_src_bug_id );
-?>
diff --git a/bug_relationship_graph.php b/bug_relationship_graph.php
index 1690967316..b0a11f2d4c 100644
--- a/bug_relationship_graph.php
+++ b/bug_relationship_graph.php
@@ -167,4 +167,3 @@
 <?php
 	include( 'bug_view_inc.php' );
 	html_page_bottom( __FILE__ );
-?>
diff --git a/bug_reminder_page.php b/bug_reminder_page.php
index 002116e399..f61e691aac 100644
--- a/bug_reminder_page.php
+++ b/bug_reminder_page.php
@@ -111,4 +111,5 @@
 <?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bug_view_inc.php' ) ?>
 <?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bugnote_view_inc.php' ) ?>
 
-<?php html_page_bottom( __FILE__ ) ?>
+<?php
+	html_page_bottom( __FILE__ );
diff --git a/bug_set_sponsorship.php b/bug_set_sponsorship.php
index a0f6bfe56d..860001ff2e 100644
--- a/bug_set_sponsorship.php
+++ b/bug_set_sponsorship.php
@@ -78,4 +78,3 @@
 	}
 
 	print_header_redirect_view( $f_bug_id );
-?>
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index b42eb4f0e3..1625971fca 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -657,15 +657,12 @@
 	</td>
 </tr>
 
-
 </table>
 </form>
 
 <?php
 
-
 	include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bugnote_view_inc.php' );
 	html_page_bottom( __FILE__ );
 
 	last_visited_issue( $f_bug_id );
-?>
diff --git a/bugnote_add.php b/bugnote_add.php
index e91769927a..47d8c70e5e 100644
--- a/bugnote_add.php
+++ b/bugnote_add.php
@@ -65,4 +65,3 @@
 	event_signal( 'EVENT_BUGNOTE_ADD', array( $f_bug_id, $t_bugnote_id ) );
 
 	print_successful_redirect_to_bug( $f_bug_id );
-?>
diff --git a/bugnote_add_inc.php b/bugnote_add_inc.php
index 23756a286e..30162d5db5 100644
--- a/bugnote_add_inc.php
+++ b/bugnote_add_inc.php
@@ -113,4 +113,5 @@
 ?>
 
 <?php # Bugnote Add Form END ?>
-<?php } ?>
+<?php 
+}
diff --git a/bugnote_delete.php b/bugnote_delete.php
index 225ba89151..e0aabd2672 100644
--- a/bugnote_delete.php
+++ b/bugnote_delete.php
@@ -63,4 +63,3 @@
 	event_signal( 'EVENT_BUGNOTE_DELETED', array( $t_bug_id, $f_bugnote_id ) );
 
 	print_successful_redirect( string_get_bug_view_url( $t_bug_id ) . '#bugnotes' );
-?>
diff --git a/bugnote_set_view_state.php b/bugnote_set_view_state.php
index 5d3de0e09a..02f87002a9 100644
--- a/bugnote_set_view_state.php
+++ b/bugnote_set_view_state.php
@@ -64,4 +64,3 @@
 	bugnote_set_view_state( $f_bugnote_id, $f_private );
 
 	print_successful_redirect( string_get_bug_view_url( $t_bug_id ) . '#bugnotes' );
-?>
diff --git a/bugnote_stats_inc.php b/bugnote_stats_inc.php
index 5f8a242f32..60a96f8f8f 100644
--- a/bugnote_stats_inc.php
+++ b/bugnote_stats_inc.php
@@ -152,4 +152,3 @@
 </table>
 <?php
 	collapse_end( 'bugnotestats' );
-?>
diff --git a/bugnote_update.php b/bugnote_update.php
index af70ddf9fb..0ced145568 100644
--- a/bugnote_update.php
+++ b/bugnote_update.php
@@ -61,4 +61,3 @@
 	event_signal( 'EVENT_BUGNOTE_EDIT', array( $t_bug_id, $f_bugnote_id ) );
 
 	print_successful_redirect( string_get_bug_view_url( $t_bug_id ) . '#bugnotes' );
-?>
diff --git a/core/classes/MantisEnum.class.php b/core/classes/MantisEnum.class.php
index 8d00ac1c12..435ea73d53 100644
--- a/core/classes/MantisEnum.class.php
+++ b/core/classes/MantisEnum.class.php
@@ -206,4 +206,3 @@ private static function getLabelForUnknownValue( $value ) {
 		return '@' . $valueAsInteger . '@';
 	}
 }
-?>
\ No newline at end of file