diff --git a/wp-activate.php b/wp-activate.php
index dc3a0d42f5..ecdfddd09b 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -76,7 +76,9 @@ get_header( 'wp-activate' );
 
 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) { ?>
+	<?php
+	if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) {
+		?>
 
 		<h2><?php _e( 'Activation Key Required' ); ?></h2>
 		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
@@ -89,49 +91,49 @@ get_header( 'wp-activate' );
 			</p>
 		</form>
 
-	<?php
-} else {
+		<?php
+	} else {
 
-	$key    = ! empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
-	$result = wpmu_activate_signup( $key );
-	if ( is_wp_error( $result ) ) {
-		if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
-			$signup = $result->get_error_data();
-			?>
-			<h2><?php _e( 'Your account is now active!' ); ?></h2>
-				<?php
-				echo '<p class="lead-in">';
-				if ( $signup->domain . $signup->path == '' ) {
-					printf(
-						/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-						__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						network_site_url( 'wp-login.php', 'login' ),
-						$signup->user_login,
-						$signup->user_email,
-						wp_lostpassword_url()
-					);
-				} else {
-					printf(
-						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
-						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
-						$signup->user_login,
-						$signup->user_email,
-						wp_lostpassword_url()
-					);
-				}
-				echo '</p>';
-		} else {
-			?>
-			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+		$key    = ! empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup( $key );
+		if ( is_wp_error( $result ) ) {
+			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+				$signup = $result->get_error_data();
+				?>
+				<h2><?php _e( 'Your account is now active!' ); ?></h2>
+					<?php
+					echo '<p class="lead-in">';
+					if ( $signup->domain . $signup->path == '' ) {
+						printf(
+							/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+							__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+							network_site_url( 'wp-login.php', 'login' ),
+							$signup->user_login,
+							$signup->user_email,
+							wp_lostpassword_url()
+						);
+					} else {
+						printf(
+							/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+							__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+							sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
+							$signup->user_login,
+							$signup->user_email,
+							wp_lostpassword_url()
+						);
+					}
+					echo '</p>';
+			} else {
+				?>
+				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 				<p><?php echo $result->get_error_message(); ?></p>
 				<?php
-		}
-	} else {
-		$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-		$user = get_userdata( (int) $result['user_id'] );
-		?>
-		<h2><?php _e( 'Your account is now active!' ); ?></h2>
+			}
+		} else {
+			$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+			$user = get_userdata( (int) $result['user_id'] );
+			?>
+			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 
 			<div id="signup-welcome">
 			<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
@@ -159,8 +161,8 @@ get_header( 'wp-activate' );
 				</p>
 			<?php
 			endif;
+		}
 	}
-}
 	?>
 	</div>
 </div>
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 110959449d..ecf44a3ebc 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -17,6 +17,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 $is_privacy_notice = isset( $_GET['privacy-notice'] );
 
+if ( $is_privacy_notice ) {
+	$freedoms_class = '';
+	$privacy_class  = ' nav-tab-active';
+} else {
+	$freedoms_class = ' nav-tab-active';
+	$privacy_class  = '';
+}
+
 ?>
 <div class="wrap about-wrap full-width-layout">
 
@@ -29,8 +37,8 @@ $is_privacy_notice = isset( $_GET['privacy-notice'] );
 <h2 class="nav-tab-wrapper wp-clearfix">
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
 	<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab<?php if ( ! $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Freedoms' ); ?></a>
-	<a href="freedoms.php?privacy-notice" class="nav-tab<?php if ( $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Privacy' ); ?></a>
+	<a href="freedoms.php" class="nav-tab<?php echo $freedoms_class; ?>"><?php _e( 'Freedoms' ); ?></a>
+	<a href="freedoms.php?privacy-notice" class="nav-tab<?php echo $privacy_class; ?>"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
 <?php if ( $is_privacy_notice ) : ?>
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 4fd93e2e60..7fd8c0cd49 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -1817,21 +1817,20 @@ if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
 }
 	_e( 'If you do not remember your credentials, you should contact your web host.' );
 
+	$hostname_value = esc_attr( $hostname );
+	if ( ! empty( $port ) ) {
+		$hostname_value .= ":$port";
+	}
+
 	$password_value = '';
-if ( defined( 'FTP_PASS' ) ) {
-	$password_value = '*****';
-}
+	if ( defined( 'FTP_PASS' ) ) {
+		$password_value = '*****';
+	}
 ?>
 </p>
 <label for="hostname">
 	<span class="field-title"><?php _e( 'Hostname' ); ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ); ?>" value="
-																																						<?php
-																																						echo esc_attr( $hostname );
-																																						if ( ! empty( $port ) ) {
-																																							echo ":$port";}
-?>
-"<?php disabled( defined( 'FTP_HOST' ) ); ?> />
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ); ?>" value="<?php echo $hostname_value; ?>"<?php disabled( defined( 'FTP_HOST' ) ); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
@@ -1858,12 +1857,7 @@ if ( defined( 'FTP_PASS' ) ) {
 foreach ( $types as $name => $text ) :
 	?>
 	<label for="<?php echo esc_attr( $name ); ?>">
-		<input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>"
-																	<?php
-																	checked( $name, $connection_type );
-																	echo $disabled;
-?>
- />
+		<input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>" <?php checked( $name, $connection_type ); ?> <?php echo $disabled; ?> />
 		<?php echo $text; ?>
 	</label>
 <?php
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index a8d39ecb04..0918274f82 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -757,15 +757,15 @@ function post_comment_status_meta_box( $post ) {
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
 	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked( $post->comment_status, 'open' ); ?> /> <?php _e( 'Allow comments' ); ?></label><br />
-	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked( $post->ping_status, 'open' ); ?> /> 
-																																						<?php
-																																						printf(
-																																							/* translators: %s: Codex URL */
-																																							__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
-																																							__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
-																																						);
+	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked( $post->ping_status, 'open' ); ?> />
+		<?php
+		printf(
+			/* translators: %s: Codex URL */
+			__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
+			__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
+		);
 		?>
-		</label>
+	</label>
 	<?php
 	/**
 	 * Fires at the end of the Discussion meta box on the post editing screen.
@@ -1350,16 +1350,14 @@ function attachment_id3_data_meta_box( $post ) {
 	}
 
 	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) :
+		$value = '';
+		if ( ! empty( $meta[ $key ] ) ) {
+			$value = $meta[ $key ];
+		}
 	?>
 	<p>
 		<label for="title"><?php echo $label; ?></label><br />
-		<input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="
-												<?php
-												if ( ! empty( $meta[ $key ] ) ) {
-													echo esc_attr( $meta[ $key ] );
-												}
-		?>
-		" />
+		<input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="<?php echo esc_attr( $value ); ?>" />
 	</p>
 	<?php
 	endforeach;
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 5b8bfd7e00..3276b56406 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -435,11 +435,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			</li>
 		</ul><!-- .posttype-tabs -->
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel 
-												<?php
-												echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		">
+		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
 				$recent_args    = array_merge(
@@ -473,11 +469,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel 
-		<?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+		<div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
 			if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
 				$searched       = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
@@ -515,11 +507,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all 
-							<?php
-							echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		">
+		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>">
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
@@ -771,11 +759,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel 
-										<?php
-										echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		">
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
 				$popular_terms  = get_terms(
@@ -792,11 +776,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all 
-										<?php
-										echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		">
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?> ">
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
@@ -815,11 +795,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel 
-		<?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>
-		" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+		<div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
 			if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
 				$searched       = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 3c65c7f9ee..a3f392d0d1 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -658,20 +658,20 @@ function install_plugin_information() {
 				</li>
 			<?php } if ( isset( $api->active_installs ) ) { ?>
 				<li><strong><?php _e( 'Active Installations:' ); ?></strong>
-										<?php
-										if ( $api->active_installs >= 1000000 ) {
-											$active_installs_millions = floor( $api->active_installs / 1000000 );
-											printf(
-												_nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
-												number_format_i18n( $active_installs_millions )
-											);
-										} elseif ( 0 == $api->active_installs ) {
-											_ex( 'Less Than 10', 'Active plugin installations' );
-										} else {
-											echo number_format_i18n( $api->active_installs ) . '+';
-										}
-					?>
-					</li>
+				<?php
+				if ( $api->active_installs >= 1000000 ) {
+					$active_installs_millions = floor( $api->active_installs / 1000000 );
+					printf(
+						_nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
+						number_format_i18n( $active_installs_millions )
+					);
+				} elseif ( 0 == $api->active_installs ) {
+					_ex( 'Less Than 10', 'Active plugin installations' );
+				} else {
+					echo number_format_i18n( $api->active_installs ) . '+';
+				}
+				?>
+				</li>
 			<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
 				<li><a target="_blank" href="<?php echo __( 'https://wordpress.org/plugins/' ) . $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
 			<?php } if ( ! empty( $api->homepage ) ) { ?>
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 180b0ad632..2de6c20ffb 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2177,23 +2177,27 @@ function _wp_admin_html_begin() {
 <!DOCTYPE html>
 <!--[if IE 8]>
 <html xmlns="http://www.w3.org/1999/xhtml" class="ie8 <?php echo $admin_html_class; ?>"
-																	<?php
-																	/**
-																	 * Fires inside the HTML tag in the admin header.
-																	 *
-																	 * @since 2.2.0
-																	 */
-																	do_action( 'admin_xml_ns' );
-?>
-	<?php language_attributes(); ?>>
+	<?php
+	/**
+	 * Fires inside the HTML tag in the admin header.
+	 *
+	 * @since 2.2.0
+	 */
+	do_action( 'admin_xml_ns' );
+
+	language_attributes();
+	?>
+	>
 <![endif]-->
 <!--[if !(IE 8) ]><!-->
 <html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>"
-																<?php
-																/** This action is documented in wp-admin/includes/template.php */
-																do_action( 'admin_xml_ns' );
-?>
-	<?php language_attributes(); ?>>
+	<?php
+	/** This action is documented in wp-admin/includes/template.php */
+	do_action( 'admin_xml_ns' );
+
+	language_attributes();
+	?>
+	>
 <!--<![endif]-->
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index cd4454a17b..596abe3d71 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -628,15 +628,16 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 	<h2 class="nav-tab-wrapper wp-clearfix">
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
-		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
-								<?php
-								if ( $locations_screen ) {
-									echo ' nav-tab-active';}
-?>
-"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
-			endif;
+		if ( $num_locations && $menu_count ) {
+			$active_tab_class = '';
+			if ( $locations_screen ) {
+				$active_tab_class = ' nav-tab-active';
+			}
+			?>
+			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+			<?php
+		}
 		?>
 	</h2>
 	<?php
@@ -694,8 +695,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 											), admin_url( 'nav-menus.php' )
 										)
 									);
-?>
-">
+									?>
+									">
 										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
 									</a>
 								</span>
@@ -712,8 +713,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 											), admin_url( 'nav-menus.php' )
 										)
 									);
-?>
-">
+									?>
+									">
 										<?php _ex( 'Use new menu', 'menu' ); ?>
 									</a>
 								</span>
@@ -818,9 +819,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		endif;
 
 		$metabox_holder_disabled_class = '';
-if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
-	$metabox_holder_disabled_class = ' metabox-holder-disabled';
-}
+		if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+			$metabox_holder_disabled_class = ' metabox-holder-disabled';
+		}
 	?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame" class="wp-clearfix">
@@ -842,9 +843,9 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
 			<?php
 				$new_screen_class = '';
-			if ( $add_new_screen ) {
-				$new_screen_class = 'blank-slate';
-			}
+				if ( $add_new_screen ) {
+					$new_screen_class = 'blank-slate';
+				}
 			?>
 				<h2><?php _e( 'Menu structure' ); ?></h2>
 				<div class="menu-edit <?php echo $new_screen_class; ?>">
@@ -906,9 +907,9 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 								endif;
 
 								$no_menus_style = '';
-if ( $one_theme_location_no_menus ) {
-	$no_menus_style = 'style="display: none;"';
-}
+								if ( $one_theme_location_no_menus ) {
+									$no_menus_style = 'style="display: none;"';
+								}
 							?>
 							<div class="menu-settings" <?php echo $no_menus_style; ?>>
 								<h3><?php _e( 'Menu Settings' ); ?></h3>
@@ -976,8 +977,8 @@ if ( $one_theme_location_no_menus ) {
 										), 'delete-nav_menu-' . $nav_menu_selected_id
 									)
 								);
-?>
-"><?php _e( 'Delete Menu' ); ?></a>
+								?>
+								"><?php _e( 'Delete Menu' ); ?></a>
 							</span><!-- END .delete-action -->
 							<?php endif; ?>
 							<div class="publishing-action">
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 83e05ae867..c310e7906d 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -193,12 +193,7 @@ if ( ! empty( $messages ) ) {
 			<fieldset>
 			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
 			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" 
-																	<?php
-																	checked( (bool) $details->$field_key, true );
-																	disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) );
-?>
- />
+				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
 			<fieldset>
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 5fdb881a82..db61f1249c 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -296,8 +296,8 @@ else :
 					<p>
 						<?php
 						if ( is_writeable( $file ) ) {
-?>
-<strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+						?>
+						<strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
 						<?php _e( 'This is a file in your current parent theme.' ); ?>
 					</p>
 				</div>
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 61527bfc82..566301638c 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -310,29 +310,29 @@ foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
 		<td class="check-column">
 			<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
 			<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
-										<?php
-										/* translators: %s: plugin name */
-										printf(
-											__( 'Select %s' ),
-											$plugin_data->Name
-										);
-				?>
-				</label>
-			</td>
-			<td class="plugin-title"><p>
-				<?php echo $icon; ?>
-				<strong><?php echo $plugin_data->Name; ?></strong>
-				<?php
-				/* translators: 1: plugin version, 2: new version */
+			<?php
+				/* translators: %s: plugin name */
 				printf(
-					__( 'You have version %1$s installed. Update to %2$s.' ),
-					$plugin_data->Version,
-					$plugin_data->update->new_version
+					__( 'Select %s' ),
+					$plugin_data->Name
 				);
-				echo ' ' . $details . $compat . $upgrade_notice;
 			?>
-			</p></td>
-		</tr>
+			</label>
+		</td>
+		<td class="plugin-title"><p>
+			<?php echo $icon; ?>
+			<strong><?php echo $plugin_data->Name; ?></strong>
+			<?php
+			/* translators: 1: plugin version, 2: new version */
+			printf(
+				__( 'You have version %1$s installed. Update to %2$s.' ),
+				$plugin_data->Version,
+				$plugin_data->update->new_version
+			);
+			echo ' ' . $details . $compat . $upgrade_notice;
+		?>
+		</p></td>
+	</tr>
 		<?php
 }
 ?>
@@ -386,28 +386,28 @@ foreach ( $themes as $stylesheet => $theme ) {
 		<td class="check-column">
 			<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
 			<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
-										<?php
-										/* translators: %s: theme name */
-										printf(
-											__( 'Select %s' ),
-											$theme->display( 'Name' )
-										);
-				?>
-				</label>
-			</td>
-			<td class="plugin-title"><p>
-				<img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
-				<strong><?php echo $theme->display( 'Name' ); ?></strong>
-				<?php
-				/* translators: 1: theme version, 2: new version */
+			<?php
+				/* translators: %s: theme name */
 				printf(
-					__( 'You have version %1$s installed. Update to %2$s.' ),
-					$theme->display( 'Version' ),
-					$theme->update['new_version']
+					__( 'Select %s' ),
+					$theme->display( 'Name' )
 				);
 			?>
-			</p></td>
-		</tr>
+			</label>
+		</td>
+		<td class="plugin-title"><p>
+			<img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
+			<strong><?php echo $theme->display( 'Name' ); ?></strong>
+			<?php
+			/* translators: 1: theme version, 2: new version */
+			printf(
+				__( 'You have version %1$s installed. Update to %2$s.' ),
+				$theme->display( 'Version' ),
+				$theme->update['new_version']
+			);
+		?>
+		</p></td>
+	</tr>
 		<?php
 }
 ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b0010e7e8a..1715300b40 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43568';
+$wp_version = '5.0-alpha-43569';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-login.php b/wp-login.php
index 263a19637b..96b2eb86cf 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -256,9 +256,9 @@ function login_footer( $input_id = '' ) {
 	if ( ! $interim_login ) :
 	?>
 	<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
-											<?php
-											/* translators: %s: site title */
-											printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
+	<?php
+		/* translators: %s: site title */
+		printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
 	?>
 	</a></p>
 	<?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
diff --git a/xmlrpc.php b/xmlrpc.php
index a0489bf110..5efe137527 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -31,8 +31,8 @@ include( dirname( __FILE__ ) . '/wp-load.php' );
 
 if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
 	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
-?>
-<?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; ?>
+	echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
+	?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
 	<service>
 		<engineName>WordPress</engineName>