Index: nav-menu-template.php
===================================================================
--- nav-menu-template.php	(revision 13519)
+++ nav-menu-template.php	(working copy)
@@ -24,7 +24,7 @@
  */
 function wp_nav_menu( $args = array() ) {
 	$defaults = array( 'menu' => '', 'menu_class' => 'menu', 'format' => 'div', 'echo' => true,
-	'fallback_cb' => 'wp_page_menu', 'link_before' => '', 'link_after' => '', 'before_link' => '', 'after_link' => '', );
+	'fallback_cb' => 'wp_page_menu', 'link_before' => '', 'link_after' => '', 'before_link' => '', 'after_link' => '' );
 	
 	$args = wp_parse_args( $args, $defaults );
 	$args = apply_filters( 'wp_nav_menu_args', $args );
@@ -38,7 +38,7 @@
 	if ( !$menu ) {
 		$menus = wp_get_nav_menus();
 		foreach ( $menus as $menu_maybe ) {
-			if ( wp_get_nav_menu_items($menu_maybe->term_id) ) {
+			if ( wp_get_nav_menu_items( $menu_maybe->term_id ) ) {
 				$menu = $menu_maybe;
 				break;
 			}
@@ -73,7 +73,7 @@
  **/
 function wp_get_nav_menu( $args = array() ) {
 	$defaults = array( 'menu' => '', 'menu_class' => 'menu', 'ul_class' => '', 'format' => 'div', 'type' => 'frontend',
-	'fallback_cb' => '', 'link_before' => '', 'link_after' => '', 'before_link' => '', 'after_link' => '', );
+	'fallback_cb' => '', 'link_before' => '', 'link_after' => '', 'before_link' => '', 'after_link' => '' );
 	
 	$args = wp_parse_args( $args, $defaults );
 	$args = apply_filters( 'wp_get_nav_menu_args', $args );
@@ -82,8 +82,8 @@
 	$menu = wp_get_nav_menu_object( $args->menu );
 	
 	// If no menu was found, call the fallback_cb
-	if ( !$menu || is_wp_error($menu) ) {
-		if ( function_exists($args->fallback_cb) )
+	if ( !$menu || is_wp_error( $menu ) ) {
+		if ( function_exists( $args->fallback_cb ) )
 			return call_user_func( $args->fallback_cb, $args );
 	}
 	
@@ -97,7 +97,7 @@
 	foreach ( $menu_items as $menu_item )
 		$parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
 	
-	$ul_class = isset($args->ul_class) ? ' class="'. $args->ul_class .'"' : '';
+	$ul_class = isset( $args->ul_class ) ? ' class="'. $args->ul_class .'"' : '';
 	$nav_menu .= '<ul'. $ul_class .'>';
 	
 	// Display Loop
@@ -116,7 +116,7 @@
 		if ( $last_item || $current_parent != $menu_items[ $key + 1 ]->post_parent ) {
 			if ( $last_item || in_array( $menu_items[ $key + 1 ]->post_parent, $parent_stack ) ) {
 				$nav_menu .= '</li>';
-				while ( !empty( $parent_stack ) && ($last_item || $menu_items[ $key + 1 ]->post_parent != $current_parent ) ) {
+				while ( !empty( $parent_stack ) && ( $last_item || $menu_items[ $key + 1 ]->post_parent != $current_parent ) ) {
 					$nav_menu .= '</ul></li>';
 					$current_parent = array_pop( $parent_stack );
 				}
@@ -149,7 +149,7 @@
 	$item = '';
 	switch ( $context ) {
 		case 'frontend':
-			$attr_title = ( isset($menu_item->anchor_title) && '' != $menu_item->anchor_title ) ? ' title="'. esc_attr($menu_item->anchor_title) .'"' : '';
+			$attr_title = ( isset( $menu_item->anchor_title ) && '' != $menu_item->anchor_title ) ? ' title="'. esc_attr( $menu_item->anchor_title ) .'"' : '';
 			$href = isset($menu_item->link) ? ' href="'. esc_url($menu_item->link) .'"' : '';
 			
 			$item .= '<a'. $attr_title . $href . $menu_item->target .'>';
@@ -160,9 +160,9 @@
 		
 		case 'backend':
 			$item .= '<dl><dt>';
-			$item .= '<span class="item-title">'. esc_html($menu_item->title) .'</span>';
+			$item .= '<span class="item-title">'. esc_html( $menu_item->title ) .'</span>';
 			$item .= '<span class="item-controls">';
-			$item .= '<span class="item-type">'. esc_html($menu_item->type) .'</span>';
+			$item .= '<span class="item-type">'. esc_html( $menu_item->type ) .'</span>';
 			
 			// Actions
 			$item .= '<a class="item-edit thickbox" id="edit'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=380&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
@@ -185,7 +185,7 @@
 			
 		case 'default':
 			$menu_id = 'menu-item-' . $menu_item->ID;
-			$item .= '<label class="item-title"><input type="checkbox" id="'. esc_attr($menu_id) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->link ) .'" />'. $menu_item->title .'</label>';
+			$item .= '<label class="item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->link ) .'" />'. $menu_item->title .'</label>';
 			
 			// Menu Item Settings
 			$item .= '<input type="hidden" class="item-type" value="'. esc_attr( $menu_item->append ) .'" />';
Index: nav-menu.php
===================================================================
--- nav-menu.php	(revision 13519)
+++ nav-menu.php	(working copy)
@@ -77,7 +77,7 @@
 	else
 		$slug = $menu_name;
 
-	$menu = wp_insert_term( $menu_name, 'nav_menu', array('slug' => $slug) );
+	$menu = wp_insert_term( $menu_name, 'nav_menu', array( 'slug' => $slug ) );
 
 	if ( is_wp_error($menu) )
 		return $menu;
@@ -95,7 +95,7 @@
  */
 function wp_delete_nav_menu( $menu ) {
 	$menu = wp_get_nav_menu_object( $menu );
-	if ( !$menu  )
+	if ( !$menu )
 		return false;
 
 	$menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
@@ -116,15 +116,15 @@
  * @since 3.0.0
  */
 function wp_create_default_nav_menu() {
-	$menu = wp_create_nav_menu( __('Menu 1'), array('slug' => 'menu-1') );
+	$menu = wp_create_nav_menu( __('Menu 1'), array( 'slug' => 'menu-1' ) );
 
 	if ( is_wp_error($menu) )
 		return;
 
-	$pages = get_pages( array('parent' => 0, 'number' => 15) );
+	$pages = get_pages( array( 'parent' => 0, 'number' => 15 ) );
 	$counter = 1;
 	foreach ( $pages as $page ) {
-		$item = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'menu_order' => $counter, 'tax_input' => array( 'nav_menu' => $menu->name), 'post_title' => addslashes($page->post_title) );
+		$item = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'menu_order' => $counter, 'tax_input' => array( 'nav_menu' => $menu->name ), 'post_title' => addslashes( $page->post_title ) );
 		$item_id = wp_insert_post($item, true);
 		update_post_meta( $item_id, 'menu_type', 'page' );
 		update_post_meta( $item_id, 'object_id', $page->ID );
@@ -225,14 +225,14 @@
 		case 'category' :
 			$menu_item->link = get_category_link( $menu_item->object_id );
 
-			if ( empty($menu_item->post_title) ) {
+			if ( empty( $menu_item->post_title ) ) {
 				$title_raw = get_category( $menu_item->object_id );
 				$menu_item->title =  $title_raw->cat_name;
 			} else {
 				$menu_item->title = $menu_item->post_title;
 			}
 
-			if ( empty($menu_item->post_content) )
+			if ( empty( $menu_item->post_content ) )
 				$menu_item->description = strip_tags( category_description( $menu_item->object_id ) );
 			else
 				$menu_item->description = $menu_item->post_content;
@@ -257,19 +257,19 @@
 /* @todo: update to use tax/post data
 
 			//SET anchor title
-			if (isset($wp_custom_nav_menu_items->custom_anchor_title)) {
+			if ( isset( $wp_custom_nav_menu_items->custom_anchor_title ) ) {
 				$anchor_title = $wp_custom_nav_menu_items->custom_anchor_title;
 			}
 			else {
 				$anchor_title = $title;
 			}
 
-			if ($queried_id == $wp_custom_nav_menu_items->post_id) {
+			if ( $queried_id == $wp_custom_nav_menu_items->post_id ) {
 				$li_class = 'class="current_page_item"';
 			}
 
-			if (isset($wp_custom_nav_menu_items->new_window)) {
-				if ($wp_custom_nav_menu_items->new_window > 0) {
+			if ( isset( $wp_custom_nav_menu_items->new_window ) ) {
+				if ( $wp_custom_nav_menu_items->new_window > 0 ) {
 					$target = 'target="_blank"';
 				}
 				else {