diff --git a/meson.build b/meson.build
index 7ccc92c..66286f6 100644
--- a/meson.build
+++ b/meson.build
@@ -192,7 +192,7 @@
 )
 
 if get_option('oem-ampere').allowed()
-    add_project_arguments('-DOEM_AMPERE', language : 'cpp')
+    add_project_arguments('-DOEM_AMPERE', language: 'cpp')
 endif
 
 libpldmutils_headers = ['.']
diff --git a/meson.options b/meson.options
index bf08324..531f9d4 100644
--- a/meson.options
+++ b/meson.options
@@ -1,37 +1,32 @@
 # PLDM daemon options
-option(
-    'tests',
-    type: 'feature',
-    value: 'enabled',
-    description: 'Build tests'
-)
+option('tests', type: 'feature', value: 'enabled', description: 'Build tests')
 
 option(
     'utilities',
     type: 'feature',
     value: 'enabled',
-    description: 'Enable debug utilities'
+    description: 'Enable debug utilities',
 )
 
 option(
     'libpldmresponder',
     type: 'feature',
     value: 'enabled',
-    description: 'Enable libpldmresponder'
+    description: 'Enable libpldmresponder',
 )
 
 option(
     'systemd',
     type: 'feature',
     value: 'enabled',
-    description: 'Include systemd support'
+    description: 'Include systemd support',
 )
 
 option(
     'transport-implementation',
     type: 'combo',
     choices: ['mctp-demux', 'af-mctp'],
-    description: 'transport via af-mctp or mctp-demux'
+    description: 'transport via af-mctp or mctp-demux',
 )
 
 # As per PLDM spec DSP0240 version 1.1.0, in Timing Specification for PLDM messages (Table 6),
@@ -47,7 +42,7 @@
     max: 10,
     value: 5,
     description: '''The amount of time pldm waits to get a response for a dbus
-                    message before timing out'''
+                    message before timing out''',
 )
 
 option(
@@ -55,39 +50,39 @@
     type: 'integer',
     value: 120,
     description: '''The amount of time host waits for BMC to respond to pings
-                    from host, as part of host-bmc surveillance'''
+                    from host, as part of host-bmc surveillance''',
 )
 
 # Flight Recorder for PLDM Daemon
 option(
     'flightrecorder-max-entries',
-    type:'integer',
-    min:0,
-    max:30,
+    type: 'integer',
+    min: 0,
+    max: 30,
     value: 10,
     description: '''The max number of pldm messages that can be stored in the
-                    recorder, this feature will be disabled if it is set to 0'''
+                    recorder, this feature will be disabled if it is set to 0''',
 )
 
 # PLDM Daemon Terminus options
 option(
     'terminus-id',
-    type:'integer',
-    min:0,
+    type: 'integer',
+    min: 0,
     max: 255,
-    value:1,
+    value: 1,
     description: '''The terminus id value of the device that is running this
-                    pldm stack'''
+                    pldm stack''',
 )
 
 option(
     'terminus-handle',
-    type:'integer',
-    min:0,
-    max:65535,
-    value:1,
+    type: 'integer',
+    min: 0,
+    max: 65535,
+    value: 1,
     description: '''The terminus handle value of the device that is running this
-                    pldm stack'''
+                    pldm stack''',
 )
 
 # Timing specification options for PLDM messages
@@ -98,7 +93,7 @@
     max: 30,
     value: 2,
     description: '''The number of times a requester is obligated to retry a
-                    request'''
+                    request''',
 )
 
 option(
@@ -107,7 +102,7 @@
     min: 5,
     max: 6,
     value: 5,
-    description: 'Instance ID expiration interval in seconds'
+    description: 'Instance ID expiration interval in seconds',
 )
 
 # Default response-time-out set to 2 seconds to facilitate a minimum retry of
@@ -119,7 +114,7 @@
     max: 4800,
     value: 2000,
     description: '''The amount of time a requester has to wait for a response
-                    message in milliseconds'''
+                    message in milliseconds''',
 )
 
 # Firmware update configuration parameters
@@ -130,15 +125,15 @@
     max: 4294967295,
     value: 4096,
     description: '''Maximum size in bytes of the variable payload allowed to be
-                    requested by the FD, via RequestFirmwareData command'''
+                    requested by the FD, via RequestFirmwareData command''',
 )
 
 # Bios Attributes option
 option(
     'system-specific-bios-json',
-    type : 'feature',
+    type: 'feature',
     value: 'disabled',
-    description : 'Support for different set of bios attributes for different types of systems'
+    description: 'Support for different set of bios attributes for different types of systems',
 )
 
 # PLDM Soft Power off options
@@ -146,14 +141,14 @@
     'softoff',
     type: 'feature',
     value: 'enabled',
-    description: 'Build soft power off application'
+    description: 'Build soft power off application',
 )
 
 option(
     'softoff-timeout-seconds',
     type: 'integer',
     value: 7200,
-    description: 'softoff: Time to wait for host to gracefully shutdown'
+    description: 'softoff: Time to wait for host to gracefully shutdown',
 )
 
 # Vendor Specific Options
@@ -163,16 +158,16 @@
     'oem-ibm',
     type: 'feature',
     value: 'enabled',
-    description: 'Enable IBM OEM PLDM'
+    description: 'Enable IBM OEM PLDM',
 )
 
 option(
     'oem-ibm-dma-maxsize',
     type: 'integer',
-    min:4096,
+    min: 4096,
     max: 16773120,
     value: 8384512,
-    description: 'OEM-IBM: max DMA size'
+    description: 'OEM-IBM: max DMA size',
 )
 
 
@@ -196,7 +191,7 @@
                     will send `GetSensorReading` to get the PLDM sensor values
                     of the monitoring terminus after each configured
                     interval.''',
-    value: 999
+    value: 999,
 )
 
 # Platform-mc configuration parameters
@@ -215,5 +210,5 @@
                     interval between current timestamp and latest updated
                     timestamp of the sensor. The task will send
                     `GetSensorReading` if the sensor need to be updated.''',
-    value: 249
+    value: 249,
 )
diff --git a/oem/ampere/event/meson.build b/oem/ampere/event/meson.build
index 444f7a5..a69042d 100644
--- a/oem/ampere/event/meson.build
+++ b/oem/ampere/event/meson.build
@@ -1,7 +1,4 @@
-oem_files += files(
-    'oem_event_manager.cpp',
-    'cper.cpp',
-    )
+oem_files += files('cper.cpp', 'oem_event_manager.cpp')
 
 libcper_dep = dependency('libcper', include_type: 'system')
-deps += [libcper_dep]
\ No newline at end of file
+deps += [libcper_dep]
diff --git a/oem/ampere/meson.build b/oem/ampere/meson.build
index 8c37ab1..b5e7ad9 100644
--- a/oem/ampere/meson.build
+++ b/oem/ampere/meson.build
@@ -1 +1 @@
-subdir('event')
\ No newline at end of file
+subdir('event')