diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index 77c8f6939..eb862d968 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -1,28 +1,15 @@
 safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib
+columnar_srcdir = $(citus_abs_top_srcdir)/src/backend/columnar
+SUBDIRS = . safeclib
+SUBDIRS +=
+OBJS += \
+	$(patsubst $(columnar_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(columnar_srcdir)/$(dir)/*.c))))
+
 MODULE_big = columnar
 
-OBJS = safeclib/mem_primitives_lib.o \
-       safeclib/memcpy_s.o \
-	   safeclib/safe_str_constraint.o \
-	   safeclib/safe_mem_constraint.o \
-	   safeclib/ignore_handler_s.o \
-	   safeclib/abort_handler_s.o \
-       columnar.o \
-       columnar_tableam.o \
-	   columnar_storage.o \
-	   columnar_compression.o \
-	   columnar_customscan.o \
-	   columnar_debug.o \
-	   columnar_metadata.o \
-	   columnar_reader.o \
-	   columnar_writer.o \
-	   mod.o \
-	   write_state_management.o 
 
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include 
 
-DATA = $(wildcard sql/*--*.sql)
-REGRESS = columnar
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c
index 684ef8367..ff6e6cffc 100644
--- a/src/backend/columnar/columnar_tableam.c
+++ b/src/backend/columnar/columnar_tableam.c
@@ -1026,12 +1026,12 @@ columnar_vacuum_rel(Relation rel, VacuumParams *params,
 {
 	if (!CheckCitusVersion(WARNING))
 	{
-	 	/*
-	 	 * Skip if the extension catalogs are not up-to-date, but avoid
-	 	 * erroring during auto-vacuum.
-	 	 */
-	 	return;
-	} 
+		/*
+		 * Skip if the extension catalogs are not up-to-date, but avoid
+		 * erroring during auto-vacuum.
+		 */
+		return;
+	}
 
 	/*
 	 * If metapage version of relation is older, then we hint users to VACUUM
diff --git a/src/backend/columnar/mod.c b/src/backend/columnar/mod.c
index e2a472a29..cb52b3c22 100644
--- a/src/backend/columnar/mod.c
+++ b/src/backend/columnar/mod.c
@@ -33,9 +33,3 @@ _PG_init(void)
 	columnar_init_gucs();
 	columnar_tableam_init();
 }
-
-void
-_PG_fini(void)
-{
-	columnar_tableam_finish();
-}
diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index a6cd04a24..1b343d6e8 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -6,7 +6,6 @@ safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib
 safestringlib_builddir = $(citus_top_builddir)/vendor/safestringlib/build
 safestringlib_a = $(safestringlib_builddir)/libsafestring_static.a
 safestringlib_sources = $(wildcard $(safestringlib_srcdir)/safeclib/*)
-
 MODULE_big = citus
 EXTENSION = citus
 
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index ca5de68b5..b23905867 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -354,10 +354,11 @@ _PG_init(void)
 	{
 		DoInitialCleanup();
 	}
-	
+
 	load_file("columnar.so", false);
 }
 
+
 /*
  * DoInitialCleanup does cleanup at start time.
  * Currently it: