diff --git a/features/scaffold.feature b/features/scaffold.feature
index 8d3a1fac4..e308c5ef9 100644
--- a/features/scaffold.feature
+++ b/features/scaffold.feature
@@ -150,7 +150,7 @@ Feature: WordPress code scaffolding
       """
     And STDOUT should contain:
       """
-      'menu_icon'         => 'dashicons-admin-post',
+      'menu_icon'             => 'dashicons-admin-post',
       """
 
   Scenario: CPT slug is too long
@@ -176,7 +176,7 @@ Feature: WordPress code scaffolding
     When I run `wp scaffold post-type zombie --dashicon="art"`
     Then STDOUT should contain:
       """
-      'menu_icon'         => 'dashicons-art',
+      'menu_icon'             => 'dashicons-art',
       """
 
   Scenario: Scaffold a Custom Post Type with dashicon in the case of passing "dashicon-info"
@@ -184,7 +184,7 @@ Feature: WordPress code scaffolding
     When I run `wp scaffold post-type zombie --dashicon="dashicon-info"`
     Then STDOUT should contain:
       """
-      'menu_icon'         => 'dashicons-info',
+      'menu_icon'             => 'dashicons-info',
       """
 
   Scenario: Scaffold a Custom Post Type with dashicon in the case of passing "dashicons-info"
@@ -192,7 +192,7 @@ Feature: WordPress code scaffolding
     When I run `wp scaffold post-type zombie --dashicon="dashicons-info"`
     Then STDOUT should contain:
       """
-      'menu_icon'         => 'dashicons-info',
+      'menu_icon'             => 'dashicons-info',
       """
 
   Scenario: Scaffold a plugin
diff --git a/templates/post_type.mustache b/templates/post_type.mustache
index 753bdd876..e58c0ff37 100644
--- a/templates/post_type.mustache
+++ b/templates/post_type.mustache
@@ -1,5 +1,5 @@
 	register_post_type( '{{slug}}', array(
-		'labels'            => array(
+		'labels'                => array(
 			'name'                  => __( '{{label_plural_ucfirst}}', '{{textdomain}}' ),
 			'singular_name'         => __( '{{label_ucfirst}}', '{{textdomain}}' ),
 			'all_items'             => __( 'All {{label_plural_ucfirst}}', '{{textdomain}}' ),
@@ -26,16 +26,16 @@
 			'parent_item_colon'     => __( 'Parent {{label_ucfirst}}:', '{{textdomain}}' ),
 			'menu_name'             => __( '{{label_plural_ucfirst}}', '{{textdomain}}' ),
 		),
-		'public'            => true,
-		'hierarchical'      => false,
-		'show_ui'           => true,
-		'show_in_nav_menus' => true,
-		'supports'          => array( 'title', 'editor' ),
-		'has_archive'       => true,
-		'rewrite'           => true,
-		'query_var'         => true,
-		'menu_icon'         => 'dashicons-{{dashicon}}',
-		'show_in_rest'      => true,
-		'rest_base'         => '{{slug}}',
+		'public'                => true,
+		'hierarchical'          => false,
+		'show_ui'               => true,
+		'show_in_nav_menus'     => true,
+		'supports'              => array( 'title', 'editor' ),
+		'has_archive'           => true,
+		'rewrite'               => true,
+		'query_var'             => true,
+		'menu_icon'             => 'dashicons-{{dashicon}}',
+		'show_in_rest'          => true,
+		'rest_base'             => '{{slug}}',
 		'rest_controller_class' => 'WP_REST_Posts_Controller',
 	) );
diff --git a/templates/post_type_extended.mustache b/templates/post_type_extended.mustache
index d0302fa34..8c0a1fd1f 100644
--- a/templates/post_type_extended.mustache
+++ b/templates/post_type_extended.mustache
@@ -1,30 +1,43 @@
 <?php
 
+/**
+ * Registers the `{{machine_name}}` post type.
+ */
 function {{machine_name}}_init() {
 {{output}}
 }
 add_action( 'init', '{{machine_name}}_init' );
 
+/**
+ * Sets the post updated messages for the `{{machine_name}}` post type.
+ *
+ * @param  array $messages Post updated messages.
+ * @return array Messages for the `{{machine_name}}` post type.
+ */
 function {{machine_name}}_updated_messages( $messages ) {
 	global $post;
 
 	$permalink = get_permalink( $post );
 
 	$messages['{{slug}}'] = array(
-		0 => '', // Unused. Messages start at index 1.
-		1 => sprintf( __('{{label_ucfirst}} updated. <a target="_blank" href="%s">View {{label}}</a>', '{{textdomain}}'), esc_url( $permalink ) ),
-		2 => __('Custom field updated.', '{{textdomain}}'),
-		3 => __('Custom field deleted.', '{{textdomain}}'),
-		4 => __('{{label_ucfirst}} updated.', '{{textdomain}}'),
+		0  => '', // Unused. Messages start at index 1.
+		/* translators: %s: post permalink */
+		1  => sprintf( __( '{{label_ucfirst}} updated. <a target="_blank" href="%s">View {{label}}</a>', '{{textdomain}}' ), esc_url( $permalink ) ),
+		2  => __( 'Custom field updated.', '{{textdomain}}' ),
+		3  => __( 'Custom field deleted.', '{{textdomain}}' ),
+		4  => __( '{{label_ucfirst}} updated.', '{{textdomain}}' ),
 		/* translators: %s: date and time of the revision */
-		5 => isset($_GET['revision']) ? sprintf( __('{{label_ucfirst}} restored to revision from %s', '{{textdomain}}'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-		6 => sprintf( __('{{label_ucfirst}} published. <a href="%s">View {{label}}</a>', '{{textdomain}}'), esc_url( $permalink ) ),
-		7 => __('{{label_ucfirst}} saved.', '{{textdomain}}'),
-		8 => sprintf( __('{{label_ucfirst}} submitted. <a target="_blank" href="%s">Preview {{label}}</a>', '{{textdomain}}'), esc_url( add_query_arg( 'preview', 'true', $permalink ) ) ),
-		9 => sprintf( __('{{label_ucfirst}} scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview {{label}}</a>', '{{textdomain}}'),
-		// translators: Publish box date format, see https://secure.php.net/manual/en/function.date.php
+		5  => isset( $_GET['revision'] ) ? sprintf( __( '{{label_ucfirst}} restored to revision from %s', '{{textdomain}}' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+		/* translators: %s: post permalink */
+		6  => sprintf( __( '{{label_ucfirst}} published. <a href="%s">View {{label}}</a>', '{{textdomain}}' ), esc_url( $permalink ) ),
+		7  => __( '{{label_ucfirst}} saved.', '{{textdomain}}' ),
+		/* translators: %s: post permalink */
+		8  => sprintf( __( '{{label_ucfirst}} submitted. <a target="_blank" href="%s">Preview {{label}}</a>', '{{textdomain}}' ), esc_url( add_query_arg( 'preview', 'true', $permalink ) ) ),
+		/* translators: 1: Publish box date format, see https://secure.php.net/date 2: Post permalink */
+		9  => sprintf( __( '{{label_ucfirst}} scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview {{label}}</a>', '{{textdomain}}' ),
 		date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( $permalink ) ),
-		10 => sprintf( __('{{label_ucfirst}} draft updated. <a target="_blank" href="%s">Preview {{label}}</a>', '{{textdomain}}'), esc_url( add_query_arg( 'preview', 'true', $permalink ) ) ),
+		/* translators: %s: post permalink */
+		10 => sprintf( __( '{{label_ucfirst}} draft updated. <a target="_blank" href="%s">Preview {{label}}</a>', '{{textdomain}}' ), esc_url( add_query_arg( 'preview', 'true', $permalink ) ) ),
 	);
 
 	return $messages;