diff --git a/common/meson.build b/common/meson.build
index 5642b44..73ef76f 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -1,17 +1,13 @@
 
 subdir('pldm')
 
-software_common_lib = static_library('software_common_lib',
-  'src/software_manager.cpp',
-  'src/device.cpp',
-  'src/software_config.cpp',
-  'src/software.cpp',
-  'src/software_update.cpp',
-  include_directories: ['.','include/', common_include],
-  dependencies: [
-    pdi_dep,
-    phosphor_logging_dep,
-    sdbusplus_dep,
-    libpldm_dep,
-  ],
+software_common_lib = static_library(
+    'software_common_lib',
+    'src/software_manager.cpp',
+    'src/device.cpp',
+    'src/software_config.cpp',
+    'src/software.cpp',
+    'src/software_update.cpp',
+    include_directories: ['.', 'include/', common_include],
+    dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep],
 )
diff --git a/meson.build b/meson.build
index 2864764..f5420ea 100644
--- a/meson.build
+++ b/meson.build
@@ -71,12 +71,12 @@
 common_build = build_tests.allowed()
 
 if common_build
-  libpldm_dep = dependency('libpldm')
+    libpldm_dep = dependency('libpldm')
 
-  subdir('common')
+    subdir('common')
 endif
 
 if build_tests.allowed()
-  subdir('test')
+    subdir('test')
 endif
 
diff --git a/test/common/exampledevice/meson.build b/test/common/exampledevice/meson.build
index eebead1..829f110 100644
--- a/test/common/exampledevice/meson.build
+++ b/test/common/exampledevice/meson.build
@@ -1,30 +1,15 @@
-libexampledevice = static_library('example_device',
-  'example_device.cpp',
-  include_directories: ['.', common_include],
-  dependencies: [
-    pdi_dep,
-    phosphor_logging_dep,
-    sdbusplus_dep,
-    libpldm_dep,
-  ],
-  link_with: [
-    software_common_lib,
-  ],
+libexampledevice = static_library(
+    'example_device',
+    'example_device.cpp',
+    include_directories: ['.', common_include],
+    dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep],
+    link_with: [software_common_lib],
 )
 
 executable(
-  'example-code-updater',
-  'example_updater_main.cpp',
-  include_directories: ['.', common_include],
-  dependencies: [
-    pdi_dep,
-    phosphor_logging_dep,
-    sdbusplus_dep,
-    libpldm_dep,
-  ],
-  link_with: [
-    libpldmutil,
-    software_common_lib,
-    libexampledevice
-  ],
+    'example-code-updater',
+    'example_updater_main.cpp',
+    include_directories: ['.', common_include],
+    dependencies: [pdi_dep, phosphor_logging_dep, sdbusplus_dep, libpldm_dep],
+    link_with: [libpldmutil, software_common_lib, libexampledevice],
 )