diff --git a/src/access/pg_tde_slot.c b/src/access/pg_tde_slot.c
index d99a3d59..4b4dfb23 100644
--- a/src/access/pg_tde_slot.c
+++ b/src/access/pg_tde_slot.c
@@ -356,10 +356,10 @@ tdeheap_slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *of
 	HeapTupleHeader tup = tuple->t_data;
 	bool hasnulls = HeapTupleHasNulls(tuple);
 	int	attnum;
-	char *tp;				/* ptr to tuple data */
-	uint32 off;			/* offset in tuple data */
+	char *tp;					/* ptr to tuple data */
+	uint32 off;					/* offset in tuple data */
 	bits8 *bp = tup->t_bits;	/* ptr to null bitmap in tuple */
-	bool slow;			/* can we use/set attcacheoff? */
+	bool slow;					/* can we use/set attcacheoff? */
 
 	/* We can only fetch as many attributes as the tuple has. */
 	natts = Min(HeapTupleHeaderGetNatts(tuple->t_data), natts);
@@ -449,7 +449,7 @@ tdeheap_slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *of
 static HeapTuple
 slot_copytuple(void *buffer, HeapTuple tuple)
 {
-	HeapTuple	newTuple;
+	HeapTuple newTuple;
 
 	if (!HeapTupleIsValid(tuple) || tuple->t_data == NULL)
 		return NULL;
diff --git a/src/access/pg_tde_xlog_encrypt.c b/src/access/pg_tde_xlog_encrypt.c
index 84f820b9..e75719aa 100644
--- a/src/access/pg_tde_xlog_encrypt.c
+++ b/src/access/pg_tde_xlog_encrypt.c
@@ -65,7 +65,7 @@ XLogInitGUC(void)
 static int
 XLOGChooseNumBuffers(void)
 {
-	int			xbuffers;
+	int	xbuffers;
 
 	xbuffers = NBuffers / 32;
 	if (xbuffers > (wal_segment_size / XLOG_BLCKSZ))
@@ -81,7 +81,7 @@ XLOGChooseNumBuffers(void)
 Size
 TDEXLogEncryptBuffSize(void)
 {
-	int			xbuffers;
+	int	xbuffers;
 
 	xbuffers = (XLOGbuffers == -1) ? XLOGChooseNumBuffers() : XLOGbuffers;
 	return (Size) XLOG_BLCKSZ * xbuffers;
@@ -100,7 +100,7 @@ TDEXLogEncryptBuffSize(void)
 void
 TDEXLogShmemInit(void)
 {
-	bool		foundBuf;
+	bool foundBuf;
 
 	if (EncryptXLog)
 	{
@@ -312,4 +312,4 @@ SetXLogPageIVPrefix(TimeLineID tli, XLogRecPtr lsn, char *iv_prefix)
 	iv_prefix[11] = (lsn & 0xFF);
 }
 
-#endif							/* PERCONA_EXT */
+#endif /* PERCONA_EXT */
diff --git a/src/catalog/tde_global_space.c b/src/catalog/tde_global_space.c
index 2bdafb61..b6ca8cad 100644
--- a/src/catalog/tde_global_space.c
+++ b/src/catalog/tde_global_space.c
@@ -89,7 +89,7 @@ init_default_keyring(void)
 {
 	if (GetAllKeyringProviders(GLOBAL_DATA_TDE_OID, GLOBALTABLESPACE_OID) == NIL)
 	{
-		char		path[MAXPGPATH] = {0};
+		char path[MAXPGPATH] = {0};
 		static KeyringProvideRecord provider =
 		{
 			.provider_name = KEYRING_DEFAULT_NAME,
diff --git a/src/catalog/tde_principal_key.c b/src/catalog/tde_principal_key.c
index 78d431bd..7e9ea8a8 100644
--- a/src/catalog/tde_principal_key.c
+++ b/src/catalog/tde_principal_key.c
@@ -386,7 +386,7 @@ RotatePrincipalKey(TDEPrincipalKey *current_key, const char *new_key_name, const
 bool
 xl_tde_perform_rotate_key(XLogPrincipalKeyRotate *xlrec)
 {
-	bool		ret;
+	bool ret;
 
 	ret = pg_tde_write_map_keydata_files(xlrec->map_size, xlrec->buff, xlrec->keydata_size, &xlrec->buff[xlrec->map_size]);
 	clear_principal_key_cache(xlrec->databaseId);
diff --git a/src/common/pg_tde_shmem.c b/src/common/pg_tde_shmem.c
index 3a0b98ed..1d027778 100644
--- a/src/common/pg_tde_shmem.c
+++ b/src/common/pg_tde_shmem.c
@@ -69,9 +69,9 @@ TdeRequiredLocksCount(void)
 void
 TdeShmemInit(void)
 {
-	bool		found;
+	bool found;
 	TdeSharedState *tdeState;
-	Size		required_shmem_size = TdeRequiredSharedMemorySize();
+	Size required_shmem_size = TdeRequiredSharedMemorySize();
 
 	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
 	/* Create or attach to the shared memory state */