diff --git a/src/backend/distributed/operations/worker_node_manager.c b/src/backend/distributed/operations/worker_node_manager.c
index a1637bf34..49737d389 100644
--- a/src/backend/distributed/operations/worker_node_manager.c
+++ b/src/backend/distributed/operations/worker_node_manager.c
@@ -232,9 +232,9 @@ ClientHostAddress(StringInfo clientHostStringInfo)
 #ifdef HAVE_IPV6
 		case AF_INET6:
 #endif
-			{
-				break;
-			}
+		{
+			break;
+		}
 
 		default:
 		{
diff --git a/src/backend/distributed/utils/citus_nodefuncs.c b/src/backend/distributed/utils/citus_nodefuncs.c
index 6b8635e13..c9592b880 100644
--- a/src/backend/distributed/utils/citus_nodefuncs.c
+++ b/src/backend/distributed/utils/citus_nodefuncs.c
@@ -313,10 +313,10 @@ GetRangeTblKind(RangeTblEntry *rte)
 #if PG_VERSION_NUM >= PG_VERSION_12
 		case RTE_RESULT:
 #endif
-			{
-				rteKind = (CitusRTEKind) rte->rtekind;
-				break;
-			}
+		{
+			rteKind = (CitusRTEKind) rte->rtekind;
+			break;
+		}
 
 		case RTE_FUNCTION:
 		{
diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h
index db0bf08b9..037856c55 100644
--- a/src/include/distributed/commands.h
+++ b/src/include/distributed/commands.h
@@ -37,10 +37,10 @@
  */
 typedef struct DistributeObjectOps
 {
-	char * (*deparse)(Node *);
+	char *(*deparse)(Node *);
 	void (*qualify)(Node *);
-	List * (*preprocess)(Node *, const char *);
-	List * (*postprocess)(Node *, const char *);
+	List *(*preprocess)(Node *, const char *);
+	List *(*postprocess)(Node *, const char *);
 	ObjectAddress (*address)(Node *, bool);
 } DistributeObjectOps;
 
diff --git a/src/include/distributed/listutils.h b/src/include/distributed/listutils.h
index 3a177f7d9..4a73ec303 100644
--- a/src/include/distributed/listutils.h
+++ b/src/include/distributed/listutils.h
@@ -108,7 +108,7 @@ typedef struct ListCellAndListWrapper
 	for (int var ## PositionDoNotUse = 0; \
 		 (var ## PositionDoNotUse) < list_length(l) && \
 		 (((var) = list_nth(l, var ## PositionDoNotUse)) || true); \
-		 var ## PositionDoNotUse ++)
+		 var ## PositionDoNotUse++)
 #else
 #define foreach_ptr_append(var, l) foreach_ptr(var, l)
 #endif