diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index da54a1c64c..5cbcd88782 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -1556,7 +1556,7 @@ class Walker_Category extends Walker {
 		$link .= '>';
 		$link .= $cat_name . '</a>';
 
-		if ( (! empty($feed_image)) || (! empty($feed)) ) {
+		if ( !empty($feed_image) || !empty($feed) ) {
 			$link .= ' ';
 
 			if ( empty($feed_image) )
@@ -1564,9 +1564,9 @@ class Walker_Category extends Walker {
 
 			$link .= '<a href="' . get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) . '"';
 
-			if ( empty($feed) )
+			if ( empty($feed) ) {
 				$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
-			else {
+			} else {
 				$title = ' title="' . $feed . '"';
 				$alt = ' alt="' . $feed . '"';
 				$name = $feed;
@@ -1579,29 +1579,30 @@ class Walker_Category extends Walker {
 				$link .= $name;
 			else
 				$link .= "<img src='$feed_image'$alt$title" . ' />';
+
 			$link .= '</a>';
+
 			if ( empty($feed_image) )
 				$link .= ')';
 		}
 
-		if ( isset($show_count) && $show_count )
+		if ( !empty($show_count) )
 			$link .= ' (' . intval($category->count) . ')';
 
-		if ( isset($show_date) && $show_date ) {
+		if ( !empty($show_date) )
 			$link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
-		}
-
-		if ( isset($current_category) && $current_category )
-			$_current_category = get_category( $current_category );
 
 		if ( 'list' == $args['style'] ) {
 			$output .= "\t<li";
-			$class = 'cat-item cat-item-'.$category->term_id;
-			if ( isset($current_category) && $current_category && ($category->term_id == $current_category) )
-				$class .=  ' current-cat';
-			elseif ( isset($_current_category) && $_current_category && ($category->term_id == $_current_category->parent) )
-				$class .=  ' current-cat-parent';
-			$output .=  ' class="'.$class.'"';
+			$class = 'cat-item cat-item-' . $category->term_id;
+			if ( !empty($current_category) ) {
+				$_current_category = get_term( $current_category, $category->taxonomy );
+				if ( $category->term_id == $current_category )
+					$class .=  ' current-cat';
+				elseif ( $category->term_id == $_current_category->parent )
+					$class .=  ' current-cat-parent';
+			}
+			$output .=  ' class="' . $class . '"';
 			$output .= ">$link\n";
 		} else {
 			$output .= "\t$link<br />\n";