diff --git a/include/meson.build b/include/meson.build
index b879ead..5de0aaa 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -8,6 +8,4 @@
 conf_data.set('ERASE_MAX_GEOMETRY', get_option('erase_max_geometry'))
 conf_data.set('ERASE_MIN_GEOMETRY', get_option('erase_min_geometry'))
 
-configure_file(
-  output: 'estoraged_conf.hpp',
-  configuration: conf_data)
+configure_file(output: 'estoraged_conf.hpp', configuration: conf_data)
diff --git a/meson.build b/meson.build
index 0a0303d..2624e47 100644
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,9 @@
 project(
     'eStoraged',
     'cpp',
-    version: '1.0', meson_version: '>=1.1.1',
-    default_options: [
-      'warning_level=3',
-      'werror=true',
-      'cpp_std=c++23',
-    ],
+    version: '1.0',
+    meson_version: '>=1.1.1',
+    default_options: ['warning_level=3', 'werror=true', 'cpp_std=c++23'],
 )
 
 eStoraged_root = meson.current_source_dir()
diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..3d96d46
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,17 @@
+option(
+    'erase_min_geometry',
+    type: 'integer',
+    min: 0,
+    max: 18446744073709551615,
+    value: 10,
+    description: 'The min size allowed in bytes, used by the geometry check',
+)
+option(
+    'erase_max_geometry',
+    type: 'integer',
+    min: 0,
+    max: 18446744073709551615,
+    value: 5368709120,
+    description: 'the max size allowed in bytes, used by the geometry check',
+)
+option('tests', type: 'feature', value: 'enabled', description: 'Build tests')
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index af933fe..0000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-option ('erase_min_geometry', type : 'integer', min : 0, max : 18446744073709551615, value : 10, description : 'The min size allowed in bytes, used by the geometry check')
-option ('erase_max_geometry', type : 'integer', min : 0, max : 18446744073709551615, value : 5368709120, description : 'the max size allowed in bytes, used by the geometry check')
-option('tests', type: 'feature', value: 'enabled', description: 'Build tests')
diff --git a/service_files/meson.build b/service_files/meson.build
index 7309bee..f39c2db 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -1,15 +1,14 @@
 systemd_dep = dependency('systemd')
 
-systemd_system_unitdir = systemd_dep.get_variable(
-  'systemdsystemunitdir')
+systemd_system_unitdir = systemd_dep.get_variable('systemdsystemunitdir')
 
 conf_data = configuration_data()
 conf_data.set('BINDIR', get_option('prefix') / get_option('bindir'))
 
 configure_file(
-  configuration: conf_data,
-  input: 'xyz.openbmc_project.eStoraged.service.in',
-  output: 'xyz.openbmc_project.eStoraged.service',
-  install: true,
-  install_dir: systemd_system_unitdir,
+    configuration: conf_data,
+    input: 'xyz.openbmc_project.eStoraged.service.in',
+    output: 'xyz.openbmc_project.eStoraged.service',
+    install: true,
+    install_dir: systemd_system_unitdir,
 )
diff --git a/src/erase/meson.build b/src/erase/meson.build
index d8e7acb..2caf715 100644
--- a/src/erase/meson.build
+++ b/src/erase/meson.build
@@ -1,22 +1,22 @@
 libeStoragedErase_lib = static_library(
-  'libeStoragedErase-lib',
-  'verifyDriveGeometry.cpp',
-  'pattern.cpp',
-  'cryptoErase.cpp',
-  'sanitize.cpp',
-  'zero.cpp',
-  include_directories : eStoraged_headers,
-  implicit_include_directories: false,
-  dependencies: [
-    phosphor_dbus_interfaces_dep,
-    phosphor_logging_dep,
-    stdplus_dep,
-    boost_dep,
-  ],
+    'libeStoragedErase-lib',
+    'verifyDriveGeometry.cpp',
+    'pattern.cpp',
+    'cryptoErase.cpp',
+    'sanitize.cpp',
+    'zero.cpp',
+    include_directories: eStoraged_headers,
+    implicit_include_directories: false,
+    dependencies: [
+        phosphor_dbus_interfaces_dep,
+        phosphor_logging_dep,
+        stdplus_dep,
+        boost_dep,
+    ],
 )
 
 libeStoragedErase_dep = declare_dependency(
-  include_directories: eStoraged_headers,
-  link_with: libeStoragedErase_lib,
+    include_directories: eStoraged_headers,
+    link_with: libeStoragedErase_lib,
 )
 
diff --git a/src/meson.build b/src/meson.build
index bbbc165..3f98a6e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,54 +3,54 @@
 
 sdbusplus_dep = dependency('sdbusplus', required: false, include_type: 'system')
 if not sdbusplus_dep.found()
-  sdbusplus_proj = subproject('sdbusplus', required: true)
-  sdbusplus = sdbusplus_proj.get_variable('sdbusplus_dep')
-  sdbusplus = sdbusplus.as_system('system')
+    sdbusplus_proj = subproject('sdbusplus', required: true)
+    sdbusplus = sdbusplus_proj.get_variable('sdbusplus_dep')
+    sdbusplus = sdbusplus.as_system('system')
 endif
 
 stdplus_dep = dependency('stdplus')
 
-boost_dep = dependency('boost',version : '>=1.78.0', include_type: 'system')
+boost_dep = dependency('boost', version: '>=1.78.0', include_type: 'system')
 
 subdir('erase')
 
 libeStoraged_deps = [
-  dependency('libcryptsetup'),
-  dependency('openssl'),
-  phosphor_dbus_interfaces_dep,
-  phosphor_logging_dep,
-  sdbusplus_dep,
-  stdplus_dep,
-  boost_dep,
+    dependency('libcryptsetup'),
+    dependency('openssl'),
+    phosphor_dbus_interfaces_dep,
+    phosphor_logging_dep,
+    sdbusplus_dep,
+    stdplus_dep,
+    boost_dep,
 ]
 
 libeStoraged_lib = static_library(
-  'eStoraged-lib',
-  'estoraged.cpp',
-  'util.cpp',
-  'getConfig.cpp',
-  include_directories : eStoraged_headers,
-  implicit_include_directories: false,
-  dependencies: [libeStoraged_deps, libeStoragedErase_dep],
+    'eStoraged-lib',
+    'estoraged.cpp',
+    'util.cpp',
+    'getConfig.cpp',
+    include_directories: eStoraged_headers,
+    implicit_include_directories: false,
+    dependencies: [libeStoraged_deps, libeStoragedErase_dep],
 )
 
 libeStoraged = declare_dependency(
-  dependencies: libeStoraged_deps,
-  include_directories: eStoraged_headers,
-  link_with: libeStoraged_lib,
+    dependencies: libeStoraged_deps,
+    include_directories: eStoraged_headers,
+    link_with: libeStoraged_lib,
 )
 
 executable(
-  'eStoraged',
-  'main.cpp',
-  implicit_include_directories: false,
-  dependencies: libeStoraged,
-  install: true,
-  install_dir: get_option('bindir')
+    'eStoraged',
+    'main.cpp',
+    implicit_include_directories: false,
+    dependencies: libeStoraged,
+    install: true,
+    install_dir: get_option('bindir'),
 )
 
 build_tests = get_option('tests')
 if build_tests.allowed()
-  subdir('test')
+    subdir('test')
 endif
 
diff --git a/src/test/meson.build b/src/test/meson.build
index 180d9d5..4bf897e 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -2,24 +2,26 @@
 gmock = dependency('gmock', disabler: true, required: build_tests)
 
 tests = [
-  'erase/verifyGeometry_test',
-  'erase/pattern_test',
-  'erase/zero_test',
-  'erase/crypto_test',
-  'erase/sanitize_test',
-  'estoraged_test',
-  'util_test',
+    'erase/verifyGeometry_test',
+    'erase/pattern_test',
+    'erase/zero_test',
+    'erase/crypto_test',
+    'erase/sanitize_test',
+    'estoraged_test',
+    'util_test',
 ]
 
 test_eStoraged_headers = include_directories('include')
 
 foreach t : tests
-  test(t, executable(t.underscorify(), t + '.cpp',
-                     implicit_include_directories: false,
-                     dependencies: [
-                       gtest,
-                       gmock,
-                       libeStoraged,
-                     ],
-                     include_directories: [eStoraged_headers, test_eStoraged_headers]))
+    test(
+        t,
+        executable(
+            t.underscorify(),
+            t + '.cpp',
+            implicit_include_directories: false,
+            dependencies: [gtest, gmock, libeStoraged],
+            include_directories: [eStoraged_headers, test_eStoraged_headers],
+        ),
+    )
 endforeach
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
index bb0279b..e064a36 100644
--- a/subprojects/packagefiles/boost/meson.build
+++ b/subprojects/packagefiles/boost/meson.build
@@ -1,11 +1,5 @@
-project('boost',
-    'cpp',
-    version : '1.78.0',
-    license : 'Boost'
-)
+project('boost', 'cpp', version: '1.78.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)