diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index de81ec0119..7f17f2c3b9 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -22,24 +22,34 @@
 
 					<div class="entry-meta">
 						<?php
-							printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten'),
-								get_author_posts_url( get_the_author_meta( 'ID' ) ),
-								sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
-								get_the_author()
+							printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
+								'meta-prep meta-prep-author',
+								sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+									get_author_posts_url( get_the_author_meta( 'ID' ) ),
+									sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+									get_the_author()
+								)
 							);
 						?>
-						<span class="meta-sep"> | </span>
+						<span class="meta-sep">|</span>
 						<?php
-							printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten'),
-								esc_attr( get_the_time() ),
-								get_the_date()
+							printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
+								'meta-prep meta-prep-entry-date',
+								sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+									esc_attr( get_the_time() ),
+									get_the_date()
+								)
 							);
 							if ( wp_attachment_is_image() ) {
+								echo ' <span class="meta-sep">|</span> ';
 								$size = getimagesize( wp_get_attachment_url() );
-								printf( __( ' at <a href="%1$s" title="Link to full-size image">%2$s &times; %3$s</a>', 'twentyten'),
-									wp_get_attachment_url(),
-									$size[0],
-									$size[1]
+								printf( __( 'Full size is %s pixels', 'twentyten'),
+									sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+										wp_get_attachment_url(),
+										esc_attr( __('Link to full-size image', 'twentyten') ),
+										$size[0],
+										$size[1]
+									)
 								);
 							}							
 						?>
@@ -50,7 +60,7 @@
 						<div class="entry-attachment">
 <?php if ( wp_attachment_is_image() ) : ?>
 						<p class="attachment"><a href="<?php echo twentyten_get_next_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-							$attachment_size = apply_filters( 'twentyten_attachment_size',  900 );
+							$attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
 							echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
 						?></a></p>
 
@@ -62,9 +72,9 @@
 						<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>
+						<div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
 
-<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 
 					</div><!-- .entry-content -->
@@ -72,7 +82,7 @@
 					<div class="entry-utility">
 					<?php
 						$tag_list = get_the_tag_list();
-						if ( '' != $tag_list ) {
+						if ( $tag_list ) {
 							$utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
 						} else {
 							$utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
@@ -86,16 +96,6 @@
 							get_post_comments_feed_link()
 						);
 					?>
-
-<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
-						<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
-<?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
-						<?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
-<?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
-						<?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
-<?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
-						<?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
-<?php endif; ?>
 <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-utility -->
 				</div><!-- #post-<?php the_ID(); ?> -->