diff --git a/cold-redundancy/meson.build b/cold-redundancy/meson.build
index 3f2f8b8..06fecb0 100644
--- a/cold-redundancy/meson.build
+++ b/cold-redundancy/meson.build
@@ -12,9 +12,6 @@
         pthread,
         sdbusplus,
     ],
-    include_directories: [
-        '.',
-        '..',
-    ],
+    include_directories: ['.', '..'],
     install: false,
 )
diff --git a/meson.build b/meson.build
index 6ce40e8..07f50a4 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@
         'werror=true',
         'cpp_std=c++23',
         'buildtype=debugoptimized',
-        'prefix=/usr'
+        'prefix=/usr',
     ],
     license: 'Apache-2.0',
     version: '1.0',
@@ -17,48 +17,58 @@
 
 # Check if the compiler is Clang
 if meson.get_compiler('cpp').get_id() == 'clang'
-  add_global_arguments('-Wno-defaulted-function-deleted', language: 'cpp')
+    add_global_arguments('-Wno-defaulted-function-deleted', language: 'cpp')
 endif
 
 build_tests = get_option('tests')
 
 if get_option('oe-sdk').allowed()
-  # Setup OE SYSROOT
-  OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
-  if OECORE_TARGET_SYSROOT == ''
-    error('Unable to get $OECORE_TARGET_SYSROOT, check your environment.')
-  endif
-  message('OE_SYSROOT: ' + OECORE_TARGET_SYSROOT)
-  rpath = ':'.join([OECORE_TARGET_SYSROOT + '/lib', OECORE_TARGET_SYSROOT + '/usr/lib'])
-  ld_so = run_command('sh', '-c', 'find ' + OECORE_TARGET_SYSROOT + '/lib/ld-*.so | sort -r -n | head -n1').stdout().strip()
-  dynamic_linker = ['-Wl,-dynamic-linker,' + ld_so]
+    # Setup OE SYSROOT
+    OECORE_TARGET_SYSROOT = run_command(
+        'sh',
+        '-c',
+        'echo $OECORE_TARGET_SYSROOT',
+    ).stdout().strip()
+    if OECORE_TARGET_SYSROOT == ''
+        error('Unable to get $OECORE_TARGET_SYSROOT, check your environment.')
+    endif
+    message('OE_SYSROOT: ' + OECORE_TARGET_SYSROOT)
+    rpath = ':'.join(
+        [OECORE_TARGET_SYSROOT + '/lib', OECORE_TARGET_SYSROOT + '/usr/lib'],
+    )
+    ld_so = run_command(
+        'sh',
+        '-c',
+        'find ' + OECORE_TARGET_SYSROOT + '/lib/ld-*.so | sort -r -n | head -n1',
+    ).stdout().strip()
+    dynamic_linker = ['-Wl,-dynamic-linker,' + ld_so]
 else
-  dynamic_linker = []
+    dynamic_linker = []
 endif
 
 
 gmock = dependency('gmock', disabler: true, required: false)
 gtest = dependency('gtest', main: true, disabler: true, required: false)
 if (not gtest.found() or not gmock.found()) and build_tests.allowed()
-  gtest_opts = import('cmake').subproject_options()
-  gtest_opts.add_cmake_defines({
-  'BUILD_SHARED_LIBS': 'ON'
-  })
-  gtest_proj = import('cmake').subproject('googletest',
-                      options: gtest_opts,
-                      required: false)
-  if gtest_proj.found()
-    gtest = declare_dependency(
-      dependencies: [
-        dependency('threads'),
-        gtest_proj.dependency('gtest'),
-        gtest_proj.dependency('gtest_main'),
-      ]
+    gtest_opts = import('cmake').subproject_options()
+    gtest_opts.add_cmake_defines({'BUILD_SHARED_LIBS': 'ON'})
+    gtest_proj = import('cmake').subproject(
+        'googletest',
+        options: gtest_opts,
+        required: false,
     )
-    gmock = gtest_proj.dependency('gmock')
-  else
-    assert(false, 'Googletest is required if tests are enabled')
-  endif
+    if gtest_proj.found()
+        gtest = declare_dependency(
+            dependencies: [
+                dependency('threads'),
+                gtest_proj.dependency('gtest'),
+                gtest_proj.dependency('gtest_main'),
+            ],
+        )
+        gmock = gtest_proj.dependency('gmock')
+    else
+        assert(false, 'Googletest is required if tests are enabled')
+    endif
 endif
 
 
@@ -72,8 +82,7 @@
 pthread = dependency('threads')
 stdplus = dependency('stdplus')
 boost = dependency('boost')
-libgpiodcxx = dependency('libgpiodcxx',
-    default_options: ['bindings=cxx'])
+libgpiodcxx = dependency('libgpiodcxx', default_options: ['bindings=cxx'])
 
 nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
 
@@ -102,9 +111,11 @@
 fs = import('fs')
 foreach service : services
     if get_option(service[0])
-        fs.copyfile('services/' + service[1],
+        fs.copyfile(
+            'services/' + service[1],
             install: true,
-            install_dir: servicedir)
+            install_dir: servicedir,
+        )
     endif
 endforeach
 
@@ -121,17 +132,17 @@
 
 conf = configuration_data()
 conf.set_quoted(
-    'INPUT_HISTORY_BUSNAME_ROOT', get_option('input-history-busname-root'))
+    'INPUT_HISTORY_BUSNAME_ROOT',
+    get_option('input-history-busname-root'),
+)
 conf.set_quoted(
-    'INPUT_HISTORY_SENSOR_ROOT', get_option('input-history-sensor-root'))
-conf.set_quoted(
-    'INPUT_HISTORY_SYNC_GPIO', get_option('input-history-sync-gpio'))
-conf.set_quoted(
-    'PSU_JSON_PATH', '/usr/share/phosphor-power/psu.json')
-conf.set(
-    'SEQUENCER', sequencer_class)
-conf.set10(
-    'DEVICE_ACCESS', get_option('device-access'))
+    'INPUT_HISTORY_SENSOR_ROOT',
+    get_option('input-history-sensor-root'),
+)
+conf.set_quoted('INPUT_HISTORY_SYNC_GPIO', get_option('input-history-sync-gpio'))
+conf.set_quoted('PSU_JSON_PATH', '/usr/share/phosphor-power/psu.json')
+conf.set('SEQUENCER', sequencer_class)
+conf.set10('DEVICE_ACCESS', get_option('device-access'))
 conf.set10('IBM_VPD', get_option('ibm-vpd'))
 
 configure_file(output: 'config.h', configuration: conf)
diff --git a/meson.options b/meson.options
index d458978..d8d3c84 100644
--- a/meson.options
+++ b/meson.options
@@ -1,74 +1,95 @@
 option(
-    'input-history-busname-root', type: 'string',
+    'input-history-busname-root',
+    type: 'string',
     value: 'org.open_power.powersupply',
     description: 'The D-Bus busname root for the PS input history.',
 )
 option(
-    'input-history-sensor-root', type: 'string',
+    'input-history-sensor-root',
+    type: 'string',
     value: '/org/open_power/sensors/aggregation/per_30s',
     description: 'The D-Bus power sensors namespace root.',
 )
 option(
-    'input-history-sync-gpio', type: 'string',
+    'input-history-sync-gpio',
+    type: 'string',
     value: 'power-ffs-sync-history',
     description: 'The GPIO line name for syncing input history data.',
 )
+option('tests', type: 'feature', description: 'Build tests.')
 option(
-    'tests', type: 'feature', description: 'Build tests.',
-)
-option(
-    'long-tests', type: 'feature', value: 'disabled',
+    'long-tests',
+    type: 'feature',
+    value: 'disabled',
     description: 'Build long-running tests that are excluded from CI.',
 )
 
 # Supported power sequencers are: ucd90160, mihawk-cpld
 option(
-    'power_sequencer', type: 'string', value: 'ucd90160',
+    'power_sequencer',
+    type: 'string',
+    value: 'ucd90160',
     description: 'The power sequencer',
 )
 
 option(
-    'device-access', type: 'boolean', value: true,
+    'device-access',
+    type: 'boolean',
+    value: true,
     description: 'Enable UCD90160 hardware access.',
 )
 
 option(
-    'ibm-vpd', type: 'boolean', value: false,
+    'ibm-vpd',
+    type: 'boolean',
+    value: false,
     description: 'Setup for IBM VPD collection for inventory.',
 )
 
 option(
-    'ucd90160-yaml', type: 'string', value: 'example/ucd90160.yaml',
+    'ucd90160-yaml',
+    type: 'string',
+    value: 'example/ucd90160.yaml',
     description: 'The sequencer definition file to use.',
 )
 option(
-    'oe-sdk', type: 'feature', value: 'disabled', description: 'Enable OE SDK'
+    'oe-sdk',
+    type: 'feature',
+    value: 'disabled',
+    description: 'Enable OE SDK',
 )
 option(
-    'cold-redundancy', type: 'boolean',
-    description: 'Enable support for cold redundancy'
+    'cold-redundancy',
+    type: 'boolean',
+    description: 'Enable support for cold redundancy',
 )
 option(
-    'supply-monitor', type: 'boolean',
-    description: 'Enable support for power supply monitoring'
+    'supply-monitor',
+    type: 'boolean',
+    description: 'Enable support for power supply monitoring',
 )
 option(
-    'supply-monitor-ng', type: 'boolean',
-    description: 'Enable support for power supply monitoring'
+    'supply-monitor-ng',
+    type: 'boolean',
+    description: 'Enable support for power supply monitoring',
 )
 option(
-    'regulators', type: 'boolean',
-    description: 'Enable support for voltage regulator control'
+    'regulators',
+    type: 'boolean',
+    description: 'Enable support for voltage regulator control',
 )
 option(
-    'sequencer-monitor', type: 'boolean',
-    description: 'Enable support for power sequencer control'
+    'sequencer-monitor',
+    type: 'boolean',
+    description: 'Enable support for power sequencer control',
 )
 option(
-    'power-control', type: 'boolean',
-    description: 'Enable support for power sequencer control utilizing JSON configuration and supporting multiple systems in a single build image'
+    'power-control',
+    type: 'boolean',
+    description: 'Enable support for power sequencer control utilizing JSON configuration and supporting multiple systems in a single build image',
 )
 option(
-    'utils', type: 'boolean',
-    description: 'Enable support for power supply utilities'
+    'utils',
+    type: 'boolean',
+    description: 'Enable support for power supply utilities',
 )
diff --git a/org/open_power/Witherspoon/Fault/meson.build b/org/open_power/Witherspoon/Fault/meson.build
index 29f4a3d..3164ee3 100644
--- a/org/open_power/Witherspoon/Fault/meson.build
+++ b/org/open_power/Witherspoon/Fault/meson.build
@@ -3,7 +3,8 @@
     capture: true,
     command: [
         sdbuspp,
-        '-r', meson.project_source_root(),
+        '-r',
+        meson.project_source_root(),
         'error',
         'exception-header',
         'org.open_power.Witherspoon.Fault',
@@ -19,7 +20,8 @@
     capture: true,
     command: [
         sdbuspp,
-        '-r', meson.project_source_root(),
+        '-r',
+        meson.project_source_root(),
         'error',
         'exception-cpp',
         'org.open_power.Witherspoon.Fault',
diff --git a/phosphor-power-sequencer/meson.build b/phosphor-power-sequencer/meson.build
index e6a3770..f6f6e50 100644
--- a/phosphor-power-sequencer/meson.build
+++ b/phosphor-power-sequencer/meson.build
@@ -1,6 +1,8 @@
-install_subdir('config_files',
+install_subdir(
+    'config_files',
     strip_directory: true,
-    install_dir: get_option('datadir')/'phosphor-power-sequencer')
+    install_dir: get_option('datadir') / 'phosphor-power-sequencer',
+)
 
 subdir('src')
 
diff --git a/phosphor-power-sequencer/src/meson.build b/phosphor-power-sequencer/src/meson.build
index 9c6cbe5..68a8da8 100644
--- a/phosphor-power-sequencer/src/meson.build
+++ b/phosphor-power-sequencer/src/meson.build
@@ -1,7 +1,4 @@
-phosphor_power_sequencer_include_directories = include_directories(
-    '.',
-    '../..'
-)
+phosphor_power_sequencer_include_directories = include_directories('.', '../..')
 
 phosphor_power_sequencer_library = static_library(
     'phosphor-power-sequencer',
@@ -21,9 +18,7 @@
         phosphor_logging,
         sdbusplus,
     ],
-    include_directories: [
-        phosphor_power_sequencer_include_directories
-    ]
+    include_directories: [phosphor_power_sequencer_include_directories],
 )
 
 phosphor_power_sequencer = executable(
@@ -39,11 +34,8 @@
         sdeventplus,
         stdplus,
     ],
-    link_with: [
-        phosphor_power_sequencer_library,
-        libpower
-    ],
+    link_with: [phosphor_power_sequencer_library, libpower],
     implicit_include_directories: false,
     include_directories: phosphor_power_sequencer_include_directories,
-    install: true
+    install: true,
 )
diff --git a/phosphor-power-sequencer/test/meson.build b/phosphor-power-sequencer/test/meson.build
index 5b404d4..a920f98 100644
--- a/phosphor-power-sequencer/test/meson.build
+++ b/phosphor-power-sequencer/test/meson.build
@@ -1,30 +1,20 @@
-test('phosphor-power-sequencer-tests',
-     executable('phosphor-power-sequencer-tests',
-                'config_file_parser_error_tests.cpp',
-                'config_file_parser_tests.cpp',
-                'pmbus_driver_device_tests.cpp',
-                'rail_tests.cpp',
-                'standard_device_tests.cpp',
-                'ucd90160_device_tests.cpp',
-                'ucd90320_device_tests.cpp',
-                'ucd90x_device_tests.cpp',
-                dependencies: [
-                    gmock,
-                    gtest,
-                    nlohmann_json_dep,
-                    phosphor_logging
-                ],
-                link_args: dynamic_linker,
-                build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-                link_with: [
-                    phosphor_power_sequencer_library,
-                    libpower
-                ],
-                implicit_include_directories: false,
-                include_directories: [
-                    '.',
-                    '../src',
-                    '../..'
-                ]
-     )
+test(
+    'phosphor-power-sequencer-tests',
+    executable(
+        'phosphor-power-sequencer-tests',
+        'config_file_parser_error_tests.cpp',
+        'config_file_parser_tests.cpp',
+        'pmbus_driver_device_tests.cpp',
+        'rail_tests.cpp',
+        'standard_device_tests.cpp',
+        'ucd90160_device_tests.cpp',
+        'ucd90320_device_tests.cpp',
+        'ucd90x_device_tests.cpp',
+        dependencies: [gmock, gtest, nlohmann_json_dep, phosphor_logging],
+        link_args: dynamic_linker,
+        build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
+        link_with: [phosphor_power_sequencer_library, libpower],
+        implicit_include_directories: false,
+        include_directories: ['.', '../src', '../..'],
+    ),
 )
diff --git a/phosphor-power-supply/meson.build b/phosphor-power-supply/meson.build
index 9b1d423..2a113d5 100644
--- a/phosphor-power-supply/meson.build
+++ b/phosphor-power-supply/meson.build
@@ -1,6 +1,8 @@
-install_subdir('configurations',
-      strip_directory: true,
-      install_dir: get_option('datadir')/'phosphor-psu-monitor')
+install_subdir(
+    'configurations',
+    strip_directory: true,
+    install_dir: get_option('datadir') / 'phosphor-psu-monitor',
+)
 
 phosphor_psu_monitor = executable(
     'phosphor-psu-monitor',
@@ -19,13 +21,11 @@
     ],
     include_directories: '..',
     install: true,
-    link_with: [
-        libpower,
-    ]
+    link_with: [libpower],
 )
 
 power_supply = phosphor_psu_monitor.extract_objects('power_supply.cpp')
 
 if get_option('tests').allowed()
-  subdir('test')
+    subdir('test')
 endif
diff --git a/phosphor-power-supply/test/meson.build b/phosphor-power-supply/test/meson.build
index 86143aa..9bab5e3 100644
--- a/phosphor-power-supply/test/meson.build
+++ b/phosphor-power-supply/test/meson.build
@@ -1,27 +1,23 @@
-test('phosphor-power-supply-tests',
-     executable('phosphor-power-supply-tests',
-                'power_supply_tests.cpp',
-                'mock.cpp',
-                dependencies: [
-                    gmock,
-                    gtest,
-                    libgpiodcxx,
-                    nlohmann_json_dep,
-                    phosphor_logging,
-                    sdbusplus,
-                    sdeventplus,
-                ],
-                implicit_include_directories: false,
-                include_directories: [
-                    '.',
-                    '..',
-                    '../..'
-                ],
-                link_args: dynamic_linker,
-                link_with: [
-                  libpower,
-                  ],
-                build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-                objects: power_supply,
-     )
+test(
+    'phosphor-power-supply-tests',
+    executable(
+        'phosphor-power-supply-tests',
+        'power_supply_tests.cpp',
+        'mock.cpp',
+        dependencies: [
+            gmock,
+            gtest,
+            libgpiodcxx,
+            nlohmann_json_dep,
+            phosphor_logging,
+            sdbusplus,
+            sdeventplus,
+        ],
+        implicit_include_directories: false,
+        include_directories: ['.', '..', '../..'],
+        link_args: dynamic_linker,
+        link_with: [libpower],
+        build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
+        objects: power_supply,
+    ),
 )
diff --git a/phosphor-regulators/meson.build b/phosphor-regulators/meson.build
index a9a3dd5..6432c39 100644
--- a/phosphor-regulators/meson.build
+++ b/phosphor-regulators/meson.build
@@ -1,6 +1,8 @@
-install_subdir('config_files',
+install_subdir(
+    'config_files',
     strip_directory: true,
-    install_dir: get_option('datadir')/'phosphor-regulators')
+    install_dir: get_option('datadir') / 'phosphor-regulators',
+)
 
 subdir('src')
 
diff --git a/phosphor-regulators/src/meson.build b/phosphor-regulators/src/meson.build
index e1552fe..9025278 100644
--- a/phosphor-regulators/src/meson.build
+++ b/phosphor-regulators/src/meson.build
@@ -1,7 +1,7 @@
 phosphor_regulators_include_directories = include_directories(
     '.',
     '../..',
-    'actions'
+    'actions',
 )
 
 phosphor_regulators_library_source_files = [
@@ -25,7 +25,6 @@
     'sensor_monitoring.cpp',
     'system.cpp',
     'vpd.cpp',
-
     'actions/compare_presence_action.cpp',
     'actions/compare_vpd_action.cpp',
     'actions/if_action.cpp',
@@ -37,7 +36,7 @@
     'actions/i2c_write_byte_action.cpp',
     'actions/i2c_write_bytes_action.cpp',
     'actions/pmbus_read_sensor_action.cpp',
-    'actions/pmbus_write_vout_command_action.cpp'
+    'actions/pmbus_write_vout_command_action.cpp',
 ]
 
 phosphor_regulators_library = static_library(
@@ -50,10 +49,7 @@
         phosphor_logging,
         sdbusplus,
     ],
-    include_directories: [
-        phosphor_regulators_include_directories,
-        libi2c_inc
-    ]
+    include_directories: [phosphor_regulators_include_directories, libi2c_inc],
 )
 
 phosphor_regulators = executable(
@@ -69,21 +65,15 @@
         sdeventplus,
         stdplus,
     ],
-    link_with: [
-        phosphor_regulators_library,
-        libpower
-    ],
+    link_with: [phosphor_regulators_library, libpower],
     implicit_include_directories: false,
     include_directories: phosphor_regulators_include_directories,
-    install: true
+    install: true,
 )
 
 regsctl = executable(
     'regsctl',
     'regsctl/main.cpp',
-    dependencies: [
-        cli11_dep,
-        sdbusplus,
-    ],
-    install: true
+    dependencies: [cli11_dep, sdbusplus],
+    install: true,
 )
diff --git a/phosphor-regulators/test/meson.build b/phosphor-regulators/test/meson.build
index 3373abb..3db580f 100644
--- a/phosphor-regulators/test/meson.build
+++ b/phosphor-regulators/test/meson.build
@@ -1,6 +1,6 @@
 phosphor_regulators_tests_include_directories = include_directories(
     '.',
-    'actions'
+    'actions',
 )
 
 phosphor_regulators_tests_source_files = [
@@ -25,7 +25,6 @@
     'sensors_tests.cpp',
     'system_tests.cpp',
     'write_verification_error_tests.cpp',
-
     'actions/action_environment_tests.cpp',
     'actions/action_error_tests.cpp',
     'actions/action_utils_tests.cpp',
@@ -47,7 +46,7 @@
     'actions/pmbus_read_sensor_action_tests.cpp',
     'actions/pmbus_write_vout_command_action_tests.cpp',
     'actions/run_rule_action_tests.cpp',
-    'actions/set_device_action_tests.cpp'
+    'actions/set_device_action_tests.cpp',
 ]
 
 # Long-running tests that are excluded from CI
@@ -56,31 +55,29 @@
     phosphor_regulators_tests_source_files += 'validate-regulators-config_tests.cpp'
 endif
 
-test('phosphor-regulators-tests',
-     executable('phosphor-regulators-tests',
-                phosphor_regulators_tests_source_files,
-                dependencies: [
-                    gmock,
-                    gtest,
-                    nlohmann_json_dep,
-                    phosphor_dbus_interfaces,
-                    phosphor_logging,
-                    sdbusplus,
-                ],
-                link_args: dynamic_linker,
-                build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-                link_with: [
-                    phosphor_regulators_library,
-                    libi2c_dev_mock,
-                    libpower
-                ],
-                implicit_include_directories: false,
-                include_directories: [
-                    phosphor_regulators_include_directories,
-                    phosphor_regulators_tests_include_directories,
-                    libi2c_inc,
-                    libi2c_dev_mock_inc
-                ]
-     ),
-     timeout : 180
+test(
+    'phosphor-regulators-tests',
+    executable(
+        'phosphor-regulators-tests',
+        phosphor_regulators_tests_source_files,
+        dependencies: [
+            gmock,
+            gtest,
+            nlohmann_json_dep,
+            phosphor_dbus_interfaces,
+            phosphor_logging,
+            sdbusplus,
+        ],
+        link_args: dynamic_linker,
+        build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
+        link_with: [phosphor_regulators_library, libi2c_dev_mock, libpower],
+        implicit_include_directories: false,
+        include_directories: [
+            phosphor_regulators_include_directories,
+            phosphor_regulators_tests_include_directories,
+            libi2c_inc,
+            libi2c_dev_mock_inc,
+        ],
+    ),
+    timeout: 180,
 )
diff --git a/power-sequencer/meson.build b/power-sequencer/meson.build
index 31a8176..2129957 100644
--- a/power-sequencer/meson.build
+++ b/power-sequencer/meson.build
@@ -4,13 +4,17 @@
     ucd90160_defs_cpp = custom_target(
         'ucd90160_defs.cpp',
         command: [
-            prog_python, '@INPUT0@',
-            '-i', '@INPUT1@', '-o', meson.current_build_dir(),
+            prog_python,
+            '@INPUT0@',
+            '-i',
+            '@INPUT1@',
+            '-o',
+            meson.current_build_dir(),
         ],
         input: [
             'gen-ucd90160-defs.py',
             get_option('ucd90160-yaml'),
-            'templates/ucd90160_defs.mako.cpp'
+            'templates/ucd90160_defs.mako.cpp',
         ],
         output: 'ucd90160_defs.cpp',
     )
diff --git a/power-supply/meson.build b/power-supply/meson.build
index d2251bf..461bd23 100644
--- a/power-supply/meson.build
+++ b/power-supply/meson.build
@@ -14,9 +14,7 @@
     ],
     include_directories: '..',
     install: true,
-    link_with: [
-        libpower,
-    ]
+    link_with: [libpower],
 )
 
 record_manager = psu_monitor.extract_objects('record_manager.cpp')
diff --git a/power-supply/test/meson.build b/power-supply/test/meson.build
index 39aec2a..74018d4 100644
--- a/power-supply/test/meson.build
+++ b/power-supply/test/meson.build
@@ -13,9 +13,7 @@
         include_directories: '../..',
         link_args: dynamic_linker,
         build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-        link_with: [
-            libpower,
-        ],
+        link_with: [libpower],
         objects: record_manager,
-    )
+    ),
 )
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
index 2caabf5..6935475 100644
--- a/subprojects/packagefiles/boost/meson.build
+++ b/subprojects/packagefiles/boost/meson.build
@@ -1,11 +1,5 @@
-project('boost',
-    'cpp',
-    version : '1.84.0',
-    license : 'Boost'
-)
+project('boost', 'cpp', version: '1.84.0', license: 'Boost')
 
-boost_dep = declare_dependency(
-    include_directories : include_directories('.'),
-)
+boost_dep = declare_dependency(include_directories: include_directories('.'))
 
 meson.override_dependency('boost', boost_dep)
diff --git a/test/meson.build b/test/meson.build
index 6fa8fee..35f851e 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -7,16 +7,11 @@
         'nvtest.cpp',
         'temporary_file_tests.cpp',
         'temporary_subdirectory_tests.cpp',
-        dependencies: [
-            gmock,
-            gtest,
-        ],
+        dependencies: [gmock, gtest],
         link_args: dynamic_linker,
         build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-        link_with: [
-            libpower
-        ],
+        link_with: [libpower],
         implicit_include_directories: false,
         include_directories: '..',
-    )
+    ),
 )
diff --git a/tools/i2c/meson.build b/tools/i2c/meson.build
index fe23704..bd6beb7 100644
--- a/tools/i2c/meson.build
+++ b/tools/i2c/meson.build
@@ -1,14 +1,11 @@
-libi2c_dev = static_library(
-    'i2c_dev',
-    'i2c.cpp',
-    link_args : '-li2c',
-)
+libi2c_dev = static_library('i2c_dev', 'i2c.cpp', link_args: '-li2c')
 
 libi2c_inc = include_directories('.')
 libi2c_dep = declare_dependency(
     link_with: libi2c_dev,
-    include_directories : libi2c_inc,
-    link_args : '-li2c')
+    include_directories: libi2c_inc,
+    link_args: '-li2c',
+)
 
 if get_option('tests').allowed()
     subdir('test')
diff --git a/tools/i2c/test/meson.build b/tools/i2c/test/meson.build
index 57fc7e4..262e57d 100644
--- a/tools/i2c/test/meson.build
+++ b/tools/i2c/test/meson.build
@@ -3,13 +3,8 @@
 libi2c_dev_mock = static_library(
     'i2c_dev_mock',
     'mocked_i2c_interface.cpp',
-    dependencies: [
-        gmock
-    ],
+    dependencies: [gmock],
     link_args: dynamic_linker,
     build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-    include_directories: [
-        libi2c_inc,
-        libi2c_dev_mock_inc
-    ]
+    include_directories: [libi2c_inc, libi2c_dev_mock_inc],
 )
diff --git a/tools/power-utils/meson.build b/tools/power-utils/meson.build
index 82e06b6..790e1d2 100644
--- a/tools/power-utils/meson.build
+++ b/tools/power-utils/meson.build
@@ -15,9 +15,7 @@
     ],
     include_directories: [libpower_inc, libi2c_inc],
     install: true,
-    link_with: [
-        libpower,
-    ]
+    link_with: [libpower],
 )
 
 if get_option('tests').allowed()
diff --git a/tools/power-utils/test/meson.build b/tools/power-utils/test/meson.build
index 06f483b..3ac7b5c 100644
--- a/tools/power-utils/test/meson.build
+++ b/tools/power-utils/test/meson.build
@@ -9,23 +9,11 @@
         '../aei_updater.cpp',
         '../utils.cpp',
         '../version.cpp',
-        dependencies: [
-            gtest,
-            gmock,
-            nlohmann_json_dep,
-            phosphor_logging,
-        ],
+        dependencies: [gtest, gmock, nlohmann_json_dep, phosphor_logging],
         implicit_include_directories: false,
-        include_directories: [
-            libpower_inc,
-            libi2c_inc,
-            libi2c_dev_mock_inc
-        ],
+        include_directories: [libpower_inc, libi2c_inc, libi2c_dev_mock_inc],
         link_args: dynamic_linker,
         build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-        link_with: [
-            libpower,
-            libi2c_dev_mock
-        ],
-    )
+        link_with: [libpower, libi2c_dev_mock],
+    ),
 )