diff --git a/meson.build b/meson.build
index 35aeae9..bb60f73 100644
--- a/meson.build
+++ b/meson.build
@@ -18,8 +18,8 @@
     error('This project requires c++23')
 endif
 
-if(get_option('buildtype') == 'minsize')
-    add_project_arguments('-DNDEBUG', language : 'cpp')
+if (get_option('buildtype') == 'minsize')
+    add_project_arguments('-DNDEBUG', language: 'cpp')
 endif
 
 cxx = meson.get_compiler('cpp')
@@ -31,43 +31,57 @@
 # Configuration header file(config.h) generation
 conf_data = configuration_data()
 
-conf_data.set_quoted('DEVTREE_EXPORT_FILTER_FILE', get_option('DEVTREE_EXPORT_FILTER_FILE'),
-                      description : 'Path to the phal devtree export filter file'
-                    )
+conf_data.set_quoted(
+    'DEVTREE_EXPORT_FILTER_FILE',
+    get_option('DEVTREE_EXPORT_FILTER_FILE'),
+    description: 'Path to the phal devtree export filter file',
+)
 
-conf_data.set_quoted('DEVTREE_EXP_FILE', get_option('DEVTREE_EXP_FILE'),
-                      description : 'Path to the devtree export copy file'
-                    )
+conf_data.set_quoted(
+    'DEVTREE_EXP_FILE',
+    get_option('DEVTREE_EXP_FILE'),
+    description: 'Path to the devtree export copy file',
+)
 
-conf_data.set_quoted('CEC_DEVTREE_RW_PATH', get_option('CEC_DEVTREE_RW_PATH'),
-                      description : 'Path to the devtree file r/w version'
-                    )
+conf_data.set_quoted(
+    'CEC_DEVTREE_RW_PATH',
+    get_option('CEC_DEVTREE_RW_PATH'),
+    description: 'Path to the devtree file r/w version',
+)
 
-conf_data.set_quoted('CEC_DEVTREE_RO_BASE_PATH', get_option('CEC_DEVTREE_RO_BASE_PATH'),
-                      description : 'Base path to the devtree file read only version'
-                    )
-conf_data.set_quoted('CEC_INFODB_PATH', get_option('CEC_INFODB_PATH'),
-                      description : 'Path to the devtree attributes based database path'
-                    )
+conf_data.set_quoted(
+    'CEC_DEVTREE_RO_BASE_PATH',
+    get_option('CEC_DEVTREE_RO_BASE_PATH'),
+    description: 'Base path to the devtree file read only version',
+)
+conf_data.set_quoted(
+    'CEC_INFODB_PATH',
+    get_option('CEC_INFODB_PATH'),
+    description: 'Path to the devtree attributes based database path',
+)
 
-conf_data.set_quoted('DEVTREE_REINIT_ATTRS_LIST', get_option('DEVTREE_REINIT_ATTRS_LIST'),
-                      description : 'Path to the phal devtree reinit attribute list file'
-                    )
+conf_data.set_quoted(
+    'DEVTREE_REINIT_ATTRS_LIST',
+    get_option('DEVTREE_REINIT_ATTRS_LIST'),
+    description: 'Path to the phal devtree reinit attribute list file',
+)
 
-conf_data.set_quoted('OP_DUMP_OBJ_PATH', get_option('op_dump_obj_path'),
-                      description : 'Object path requesting OpenPOWER dumps'
-                    )
+conf_data.set_quoted(
+    'OP_DUMP_OBJ_PATH',
+    get_option('op_dump_obj_path'),
+    description: 'Object path requesting OpenPOWER dumps',
+)
 
-configure_file(configuration : conf_data,
-               output : 'config.h'
-              )
+configure_file(configuration: conf_data, output: 'config.h')
 
 unit_subs = configuration_data()
 unit_subs.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 unit_subs.set('ENABLE_PHAL_TRUE', '#')
-unit_subs.set('CEC_DEVTREE_RW_PATH', get_option('CEC_DEVTREE_RW_PATH'),
-               description : 'Path to the devtree file r/w version'
-             )
+unit_subs.set(
+    'CEC_DEVTREE_RW_PATH',
+    get_option('CEC_DEVTREE_RW_PATH'),
+    description: 'Path to the devtree file r/w version',
+)
 
 if get_option('phal').enabled() and get_option('p9').enabled()
     error('phal and p9 cannot be selected at the same time')
@@ -96,9 +110,7 @@
     ]
 endif
 if build_openfsi
-    extra_sources += [
-        'procedures/openfsi/scan.cpp',
-    ]
+    extra_sources += ['procedures/openfsi/scan.cpp']
 endif
 if build_phal
     extra_sources += [
@@ -146,7 +158,13 @@
 pdi_dep = dependency('phosphor-dbus-interfaces')
 phosphor_logging_dep = dependency('phosphor-logging')
 
-gtest = dependency('gtest', main: true, disabler: true, required: false, include_type: 'system')
+gtest = dependency(
+    'gtest',
+    main: true,
+    disabler: true,
+    required: false,
+    include_type: 'system',
+)
 if get_option('tests').allowed()
     if not gtest.found()
         gtest_proj = import('cmake').subproject('gtest', required: false)
@@ -156,12 +174,12 @@
                     dependency('threads'),
                     gtest_proj.dependency('gtest'),
                     gtest_proj.dependency('gtest_main'),
-                ]
+                ],
             )
         else
             assert(
                 not get_option('tests').enabled(),
-                'Googletest is required if tests are enabled'
+                'Googletest is required if tests are enabled',
             )
         endif
     endif
@@ -189,22 +207,19 @@
         dependency('threads'),
         dependency('fmt'),
     ] + extra_dependencies,
-    install: true
+    install: true,
 )
 
 executable(
     'openpower-proc-nmi',
-    [
-        'nmi_main.cpp',
-        'nmi_interface.cpp',
-    ],
+    ['nmi_main.cpp', 'nmi_interface.cpp'],
     dependencies: [
         cxx.find_library('pdbg'),
         pdi_dep,
         phosphor_logging_dep,
         sdbusplus_dep,
-   ],
-   install: true
+    ],
+    install: true,
 )
 
 if build_phal
@@ -224,29 +239,29 @@
             pdi_dep,
             cxx.find_library('pdbg'),
             cxx.find_library('phal'),
-       ],
-       install: true
-   )
+        ],
+        install: true,
+    )
 
-   executable(
-       'openpower-clock-data-logger',
-       [
+    executable(
+        'openpower-clock-data-logger',
+        [
             'extensions/phal/clock_logger_main.cpp',
             'extensions/phal/clock_logger.cpp',
             'extensions/phal/create_pel.cpp',
             'util.cpp',
-       ],
-       dependencies: [
-             cxx.find_library('dtree'),
-             cxx.find_library('pdbg'),
-             cxx.find_library('phal'),
-             dependency('libdt-api'),
-             phosphor_logging_dep,
-             sdbusplus_dep,
-             sdeventplus_dep,
-       ],
-       install: true
-)
+        ],
+        dependencies: [
+            cxx.find_library('dtree'),
+            cxx.find_library('pdbg'),
+            cxx.find_library('phal'),
+            dependency('libdt-api'),
+            phosphor_logging_dep,
+            sdbusplus_dep,
+            sdeventplus_dep,
+        ],
+        install: true,
+    )
 endif
 
 unit_files = [
@@ -260,14 +275,15 @@
 
 systemd_system_unit_dir = dependency('systemd').get_variable(
     'systemdsystemunitdir',
-    pkgconfig_define: ['prefix', get_option('prefix')])
+    pkgconfig_define: ['prefix', get_option('prefix')],
+)
 foreach u : unit_files
     configure_file(
         configuration: unit_subs,
         input: u + '.in',
         install: true,
         install_dir: systemd_system_unit_dir,
-        output: '@BASENAME@'
+        output: '@BASENAME@',
     )
 endforeach
 
@@ -279,12 +295,9 @@
             'test/utest.cpp',
             'targeting.cpp',
             'filedescriptor.cpp',
-            dependencies: [
-                gtest,
-                dependency('phosphor-logging'),
-            ],
+            dependencies: [gtest, dependency('phosphor-logging')],
             implicit_include_directories: false,
             include_directories: '.',
-        )
+        ),
     )
 endif
diff --git a/meson.options b/meson.options
index e50144f..14d6dec 100644
--- a/meson.options
+++ b/meson.options
@@ -3,32 +3,47 @@
 option('openfsi', type: 'feature', description: 'Enable support for OpenFSI')
 option('phal', type: 'feature', description: 'Enable support for PHAL')
 
-option('DEVTREE_EXPORT_FILTER_FILE', type : 'string',
-        value : '/usr/share/pdata/preserved_attrs_list',
-        description : 'Path to the phal devtree export filter file'
+option(
+    'DEVTREE_EXPORT_FILTER_FILE',
+    type: 'string',
+    value: '/usr/share/pdata/preserved_attrs_list',
+    description: 'Path to the phal devtree export filter file',
 )
-option('DEVTREE_EXP_FILE', type : 'string',
-        value : '/var/lib/phal/exportdevtree',
-        description : 'Path to the devtree export copy file'
+option(
+    'DEVTREE_EXP_FILE',
+    type: 'string',
+    value: '/var/lib/phal/exportdevtree',
+    description: 'Path to the devtree export copy file',
 )
-option('CEC_DEVTREE_RW_PATH', type : 'string',
-        value : '/media/hostfw/running/DEVTREE',
-        description : 'Path to the devtree file r/w version'
+option(
+    'CEC_DEVTREE_RW_PATH',
+    type: 'string',
+    value: '/media/hostfw/running/DEVTREE',
+    description: 'Path to the devtree file r/w version',
 )
-option('CEC_DEVTREE_RO_BASE_PATH', type : 'string',
-        value : '/media/hostfw/running-ro/',
-        description : 'Base path to the devtree file read only version'
+option(
+    'CEC_DEVTREE_RO_BASE_PATH',
+    type: 'string',
+    value: '/media/hostfw/running-ro/',
+    description: 'Base path to the devtree file read only version',
 )
-option('CEC_INFODB_PATH', type : 'string',
-        value : '/usr/share/pdata/attributes_info.db',
-        description : 'Path to the devtree attributes based database path'
+option(
+    'CEC_INFODB_PATH',
+    type: 'string',
+    value: '/usr/share/pdata/attributes_info.db',
+    description: 'Path to the devtree attributes based database path',
 )
-option('DEVTREE_REINIT_ATTRS_LIST', type : 'string',
-        value : '/usr/share/pdata/reinit_devtree_attrs_list',
-        description : 'Path to the phal devtree reinit attribute list file'
+option(
+    'DEVTREE_REINIT_ATTRS_LIST',
+    type: 'string',
+    value: '/usr/share/pdata/reinit_devtree_attrs_list',
+    description: 'Path to the phal devtree reinit attribute list file',
 )
 
-option('op_dump_obj_path', type: 'string',
-        value: '/org/openpower/dump',
-        description : 'Object path requesting OpenPOWER dumps')
+option(
+    'op_dump_obj_path',
+    type: 'string',
+    value: '/org/openpower/dump',
+    description: 'Object path requesting OpenPOWER dumps',
+)