diff --git a/src/backend/distributed/utils/attribute.c b/src/backend/distributed/utils/attribute.c
index 89d75d2fa..a42e492d5 100644
--- a/src/backend/distributed/utils/attribute.c
+++ b/src/backend/distributed/utils/attribute.c
@@ -690,15 +690,15 @@ ExtractTopComment(const char *inputString)
 	int commentEndCharsIndex = 0;
 
 	/* If query starts with a comment */
-	if (inputString[commentEndCharsIndex] == '/' && inputString[commentEndCharsIndex +
-																1] == '*')
+	if (inputString[commentEndCharsIndex] == '/' &&
+		inputString[commentEndCharsIndex + 1] == '*')
 	{
 		/* Skip the comment start characters */
 		commentEndCharsIndex += commentStartCharsLength;
-		while (inputString[commentEndCharsIndex] && commentEndCharsIndex <
-			   inputStringLen && !(inputString[commentEndCharsIndex] == '*' &&
-								   inputString
-								   [commentEndCharsIndex + 1] == '/'))
+		while (inputString[commentEndCharsIndex] &&
+			   commentEndCharsIndex < inputStringLen &&
+			   !(inputString[commentEndCharsIndex] == '*' &&
+				 inputString [commentEndCharsIndex + 1] == '/'))
 		{
 			commentEndCharsIndex++;
 		}