diff --git a/chip_data/meson.build b/chip_data/meson.build
index 1741447..d1d34e8 100644
--- a/chip_data/meson.build
+++ b/chip_data/meson.build
@@ -21,8 +21,9 @@
 endif
 
 if 'explorer' in chip_config
-    cdb_files += {'explorer' : ['chip_data_explorer_11.cdb',
-                                'chip_data_explorer_20.cdb']}
+    cdb_files += {
+        'explorer' : ['chip_data_explorer_11.cdb', 'chip_data_explorer_20.cdb'],
+    }
 endif
 
 if 'odyssey' in chip_config
@@ -32,20 +33,26 @@
 foreach chip_dir, out_files : cdb_files
 
     source_dir = meson.current_source_dir() + '/' + chip_dir
-    build_dir  = meson.current_build_dir()
+    build_dir = meson.current_build_dir()
 
     # Get all JSON files in the chip directory. This is a bit of a workaround
     # because meson does not allow wildcards.
     json_list = run_command('json_list.sh', source_dir)
     in_files = json_list.stdout().strip().split('\n')
 
-    custom_target('build_cdb_' + chip_dir, build_by_default : true,
-                  input : in_files, output : out_files,
-                  command : [ build_cdb, 'bin', source_dir, build_dir ],
-                  install : true,
-                  install_dir : join_paths(get_option('prefix'),
-                                           get_option('datadir'),
-                                           meson.project_name()))
+    custom_target(
+        'build_cdb_' + chip_dir,
+        build_by_default: true,
+        input: in_files,
+        output: out_files,
+        command: [build_cdb, 'bin', source_dir, build_dir],
+        install: true,
+        install_dir: join_paths(
+            get_option('prefix'),
+            get_option('datadir'),
+            meson.project_name(),
+        ),
+    )
 
 endforeach
 
diff --git a/meson.build b/meson.build
index 04136e9..527be0c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,20 +1,22 @@
 # OpenBMC openpower-libhei project, see README.md for details.
-project('openpower-libhei', 'cpp',
-        version: '0.1', meson_version: '>=0.51.0',
-        default_options: [
-            'warning_level=3',
-            'werror=true',
-            'cpp_std=c++14',
-       ])
+project(
+    'openpower-libhei',
+    'cpp',
+    version: '0.1',
+    meson_version: '>=0.51.0',
+    default_options: ['warning_level=3', 'werror=true', 'cpp_std=c++14'],
+)
 
 #-------------------------------------------------------------------------------
 # Versioning
 #-------------------------------------------------------------------------------
-buildinfo = vcs_tag(command: ['git', 'describe', '--always', '--long'],
-                  input: 'buildinfo.hpp.in',
-                  output: 'buildinfo.hpp',
-                  replace_string:'@BUILDINFO@',
-                  fallback: '0')
+buildinfo = vcs_tag(
+    command: ['git', 'describe', '--always', '--long'],
+    input: 'buildinfo.hpp.in',
+    output: 'buildinfo.hpp',
+    replace_string: '@BUILDINFO@',
+    fallback: '0',
+)
 
 #-------------------------------------------------------------------------------
 # libhei library
@@ -31,14 +33,14 @@
     'src/util/hei_bit_string.cpp',
 ]
 
-libhei_dep = declare_dependency(include_directories : incdir,
-                                sources : [libhei_src, buildinfo])
+libhei_dep = declare_dependency(
+    include_directories: incdir,
+    sources: [libhei_src, buildinfo],
+)
 
 # build static library libhei.a (note that the libray name is hei, the
 # resulting filename will be libhei.a)
-libhei_static = static_library('hei',
-                                dependencies: libhei_dep,
-                                install: true)
+libhei_static = static_library('hei', dependencies: libhei_dep, install: true)
 
 install_headers(
     'src/hei_buildinfo.hpp',
@@ -49,23 +51,25 @@
     'src/hei_types.hpp',
     'src/hei_user_interface.hpp',
     'src/hei_util.hpp',
-    subdir : 'libhei'
+    subdir: 'libhei',
 )
 
 install_headers(
     'src/util/hei_bit_string.hpp',
     'src/util/hei_flyweight.hpp',
-    subdir : 'libhei/util'
+    subdir: 'libhei/util',
 )
 
 pkg_mod = import('pkgconfig')
 
-pkg_mod.generate(libraries : libhei_static,
-                 version : '0.1',
-                 name : 'libhei',
-                 subdirs: 'libhei',
-                 filebase : 'hei',
-                 description : 'Openpower Hardware Error Isolator')
+pkg_mod.generate(
+    libraries: libhei_static,
+    version: '0.1',
+    name: 'libhei',
+    subdirs: 'libhei',
+    filebase: 'hei',
+    description: 'Openpower Hardware Error Isolator',
+)
 
 #-------------------------------------------------------------------------------
 # Chip Data Files
@@ -80,6 +84,6 @@
 build_tests = get_option('tests')
 
 if not build_tests.disabled()
-  subdir('test')
+    subdir('test')
 endif
 
diff --git a/meson.options b/meson.options
new file mode 100644
index 0000000..0442e5c
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,7 @@
+option('tests', type: 'feature', description: 'Build tests')
+option(
+    'chip_config',
+    type: 'array',
+    choices: ['p10', 'explorer', 'odyssey'],
+    description: 'Configured chips to build data files for',
+)
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index b0ed04e..0000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-option('tests', type: 'feature', description: 'Build tests')
-option('chip_config', type : 'array', choices: ['p10', 'explorer', 'odyssey'],
-       description : 'Configured chips to build data files for')
diff --git a/test/meson.build b/test/meson.build
index d740b44..863c047 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -3,20 +3,21 @@
 gmock_dep = dependency('gmock', disabler: true, required: false)
 if not gtest_dep.found() or not gmock_dep.found()
     cmake = import('cmake')
-    gtest_proj = cmake.subproject('googletest',
-                                  required: false)
+    gtest_proj = cmake.subproject('googletest', required: false)
     if gtest_proj.found()
         gtest_dep = declare_dependency(
             dependencies: [
                 dependency('threads'),
                 gtest_proj.dependency('gtest'),
                 gtest_proj.dependency('gtest_main'),
-            ]
+            ],
         )
         gmock_dep = gtest_proj.dependency('gmock')
     else
-        assert(not get_option('tests').allowed(),
-               'Googletest is required if tests are enabled')
+        assert(
+            not get_option('tests').allowed(),
+            'Googletest is required if tests are enabled',
+        )
     endif
 endif
 
@@ -24,8 +25,7 @@
 subdir('simulator')
 
 # supporting files that need compiled/linked
-test_src = ['../src/util/hei_bit_string.cpp',
-            'sim_tracing.cpp']
+test_src = ['../src/util/hei_bit_string.cpp', 'sim_tracing.cpp']
 
 # build g-test framework unit tests
 gtests = [
@@ -36,8 +36,15 @@
 ]
 
 foreach g : gtests
-  test(g, executable(g.underscorify(), g + '.cpp', test_src,
-                     dependencies : gtest_dep,
-                     include_directories : incdir))
+    test(
+        g,
+        executable(
+            g.underscorify(),
+            g + '.cpp',
+            test_src,
+            dependencies: gtest_dep,
+            include_directories: incdir,
+        ),
+    )
 endforeach
 
diff --git a/test/simulator/meson.build b/test/simulator/meson.build
index 87b2d80..1ce47e7 100644
--- a/test/simulator/meson.build
+++ b/test/simulator/meson.build
@@ -1,15 +1,17 @@
 # Simulator sources
-sim_src = files(
-    'simulator.cpp',
-    'sim_hardware_access.cpp',
-    '../sim_tracing.cpp'
-)
+sim_src = files('../sim_tracing.cpp', 'sim_hardware_access.cpp', 'simulator.cpp')
 
 subdir('testcases')
 
 # Build simulator linked locally
-test('simulator',
-     executable('simulator', sim_src, test_src,
-                dependencies : gtest_dep,
-                link_with : libhei_static,
-                include_directories: [ incdir, '.' ]))
+test(
+    'simulator',
+    executable(
+        'simulator',
+        sim_src,
+        test_src,
+        dependencies: gtest_dep,
+        link_with: libhei_static,
+        include_directories: [incdir, '.'],
+    ),
+)
diff --git a/test/simulator/testcases/meson.build b/test/simulator/testcases/meson.build
index 0e894cd..0725292 100644
--- a/test/simulator/testcases/meson.build
+++ b/test/simulator/testcases/meson.build
@@ -1,11 +1,11 @@
 # Test cases
 test_src = files(
-    'sample_test_case.cpp',
     'eq_core_fir.cpp',
     'exp20_foxhound7.cpp',
     'exp20_tlx_err_rpt_1.cpp',
-    'omi_dl_fatal.cpp',
-    'tod_fault.cpp',
     'ody_mcbist2.cpp',
+    'omi_dl_fatal.cpp',
+    'sample_test_case.cpp',
+    'tod_fault.cpp',
 )