diff --git a/src/backend/distributed/master/master_delete_protocol.c b/src/backend/distributed/master/master_delete_protocol.c
index bb9a9eda5..c4a23603e 100644
--- a/src/backend/distributed/master/master_delete_protocol.c
+++ b/src/backend/distributed/master/master_delete_protocol.c
@@ -323,7 +323,7 @@ DropShards(Oid relationId, char *schemaName, char *relationName,
 
 		Assert(shardInterval->relationId == relationId);
 
-		/* Build shard relation name. */
+		/* build shard relation name */
 		appendStringInfoString(shardName, relationName);
 		AppendShardIdToStringInfo(shardName, shardId);
 		quotedShardName = quote_qualified_identifier(schemaName, shardName->data);
diff --git a/src/backend/distributed/master/master_metadata_utility.c b/src/backend/distributed/master/master_metadata_utility.c
index 7244119f7..5313da03e 100644
--- a/src/backend/distributed/master/master_metadata_utility.c
+++ b/src/backend/distributed/master/master_metadata_utility.c
@@ -334,7 +334,7 @@ InsertShardRow(Oid relationId, uint64 shardId, char storageType,
 	values[Anum_pg_dist_shard_shardid - 1] = Int64GetDatum(shardId);
 	values[Anum_pg_dist_shard_shardstorage - 1] = CharGetDatum(storageType);
 
-	/* deprecated shardalias column is always null. */
+	/* deprecated shardalias column is always null */
 	isNulls[Anum_pg_dist_shard_shardalias_DEPRECATED - 1] = true;
 
 	/* check if shard min/max values are null */
diff --git a/src/backend/distributed/master/master_stage_protocol.c b/src/backend/distributed/master/master_stage_protocol.c
index 62d6fd44a..a77caf512 100644
--- a/src/backend/distributed/master/master_stage_protocol.c
+++ b/src/backend/distributed/master/master_stage_protocol.c
@@ -238,7 +238,7 @@ master_append_table_to_shard(PG_FUNCTION_ARGS)
 	shardSchemaOid = get_rel_namespace(relationId);
 	shardSchemaName = get_namespace_name(shardSchemaOid);
 
-	/* Build shard table name. */
+	/* build shard table name */
 	shardTableName = get_rel_name(relationId);
 	AppendShardIdToName(&shardTableName, shardId);
 
@@ -489,7 +489,7 @@ UpdateShardStatistics(int64 shardId)
 	text *minValue = NULL;
 	text *maxValue = NULL;
 
-	/* Build shard qualified name. */
+	/* build shard qualified name */
 	char *shardName = get_rel_name(relationId);
 	Oid schemaId = get_rel_namespace(relationId);
 	char *schemaName = get_namespace_name(schemaId);
diff --git a/src/backend/distributed/planner/multi_physical_planner.c b/src/backend/distributed/planner/multi_physical_planner.c
index a3d88acf8..0e5138dd6 100644
--- a/src/backend/distributed/planner/multi_physical_planner.c
+++ b/src/backend/distributed/planner/multi_physical_planner.c
@@ -115,7 +115,7 @@ static uint32 HashPartitionCount(void);
 static ArrayType * SplitPointObject(ShardInterval **shardIntervalArray,
 									uint32 shardIntervalCount);
 
-/* Local functions forward declarations for task list creation */
+/* local function forward declarations for task list creation */
 static Job * BuildJobTreeTaskList(Job *jobTree);
 static List * SubquerySqlTaskList(Job *job);
 static List * SqlTaskList(Job *job);
@@ -3969,9 +3969,7 @@ FragmentAlias(RangeTblEntry *rangeTableEntry, RangeTableFragment *fragment)
 
 		aliasName = relationName;
 
-		/*
-		 * Set shard name in alias to <relation_name>_<shard_id>.
-		 */
+		/* set shard name in alias to <relation_name>_<shard_id> */
 		fragmentName = pstrdup(relationName);
 		AppendShardIdToName(&fragmentName, shardId);
 	}