diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index cfcbb7142..2989874f1 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -21,19 +21,18 @@
 
 					<div class="entry-content">
 						<div class="entry-attachment">
-<?php if ( wp_attachment_is_image( $post->ID ) ) : ?>
-						<p class="attachment"><a href="<?php echo wp_get_attachment_url($post->ID); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-							echo wp_get_attachment_image( $post->ID, array($content_width, $content_width) ); // max $content_width wide or high.
-						?></a></p>
+						<?php if ( wp_attachment_is_image() ) : ?>
+							<p class="attachment"><a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+								echo wp_get_attachment_image( $post->ID, array($content_width, $content_width) ); // max $content_width wide or high.
+							?></a></p>
 
-
-				<div id="nav-below" class="navigation">
-					<div class="nav-previous"><?php previous_image_link( false ); ?></div>
-					<div class="nav-next"><?php next_image_link( false ); ?></div>
-				</div><!-- #nav-below -->
-<?php else : ?>
-						<a href="<?php echo wp_get_attachment_url($post->ID); ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename(get_permalink()); ?></a>
-<?php endif; ?>
+							<div id="nav-below" class="navigation">
+								<div class="nav-previous"><?php previous_image_link( false ); ?></div>
+								<div class="nav-next"><?php next_image_link( false ); ?></div>
+							</div><!-- #nav-below -->
+						<?php else : ?>
+							<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename(get_permalink()); ?></a>
+						<?php endif; ?>
 						</div>
 						<div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); ?></div>
 
diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index da254bce2..cd86ce6e1 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -28,7 +28,7 @@
 <?php endif; // check for comment navigation ?>
 
 			<ol class="commentlist">
-				<?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
+				<?php wp_list_comments( array('callback' => 'twentyten_list_comment') ); ?>
 			</ol>
 
 <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index b2d6d721e..7a4d1547f 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -98,8 +98,9 @@ function twentyten_list_comment( $comment, $args, $depth ) {
 
 // Make the Visual Editor styles match the theme's styles
 function twentyten_my_editor_style( $url ) {
-		if ( !empty($url) )
-			$url .= ',';
+	if ( !empty($url) )
+		$url .= ',';
+
 	// Change the path here if using sub-directory
 	$url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';