diff --git a/meson.options b/meson.options
index 012a167..57cc06e 100644
--- a/meson.options
+++ b/meson.options
@@ -2,128 +2,177 @@
 
 option('tests', type: 'feature', description: 'Build tests')
 
-option('jffs-workaround', type: 'feature',
-        description : 'Turn on jffs workaround for core file'
-      )
-
-option('DUMP_BUSNAME', type : 'string',
-        value : 'xyz.openbmc_project.Dump.Manager',
-        description : 'The D-Bus busname to own'
-      )
-
-option('DUMP_OBJPATH', type : 'string',
-        value : '/xyz/openbmc_project/dump',
-        description : 'The dump manager D-Bus root'
-      )
-
-option('BMC_DUMP_OBJPATH', type : 'string',
-        value : '/xyz/openbmc_project/dump/bmc',
-        description : 'The BMC dump manager D-Bus object path'
-      )
-
-option('CORE_FILE_DIR', type : 'string',
-        value : '/var/lib/systemd/coredump',
-        description : 'Directory where core dumps are placed'
-      )
-
-option('BMC_DUMP_OBJ_ENTRY', type : 'string',
-        value : '/xyz/openbmc_project/dump/bmc/entry',
-        description : 'The BMC dump entry D-Bus object path'
-      )
-
-option('BMC_DUMP_PATH', type : 'string',
-        value : '/var/lib/phosphor-debug-collector/dumps/',
-        description : 'Directory where bmc dumps are placed'
-      )
-
-option('SYSTEMD_PSTORE_PATH', type : 'string',
-        value : '/var/lib/systemd/pstore/',
-        description : 'Path to the systemd pstore directory'
+option(
+    'jffs-workaround',
+    type: 'feature',
+    description: 'Turn on jffs workaround for core file',
 )
 
-option('BMC_DUMP_MAX_SIZE', type : 'integer',
-        value : 200,
-        description : 'Maximum size of one bmc dump in kilo bytes'
-      )
+option(
+    'DUMP_BUSNAME',
+    type: 'string',
+    value: 'xyz.openbmc_project.Dump.Manager',
+    description: 'The D-Bus busname to own',
+)
 
-option('BMC_DUMP_MIN_SPACE_REQD', type : 'integer',
-        value : 20,
-        description : 'Minimum space required for one bmc dump in kilo bytes'
-      )
+option(
+    'DUMP_OBJPATH',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump',
+    description: 'The dump manager D-Bus root',
+)
 
-option('BMC_DUMP_TOTAL_SIZE', type : 'integer',
-        value : 1024,
-        description : 'Total size of the dump in kilo bytes'
-      )
+option(
+    'BMC_DUMP_OBJPATH',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/bmc',
+    description: 'The BMC dump manager D-Bus object path',
+)
 
-option('ELOG_ID_PERSIST_PATH', type : 'string',
-        value : '/var/lib/phosphor-debug-collector/elogid',
-        description : 'Path of file for storing elog id\'s, which have associated dumps'
-      )
+option(
+    'CORE_FILE_DIR',
+    type: 'string',
+    value: '/var/lib/systemd/coredump',
+    description: 'Directory where core dumps are placed',
+)
 
-option('CLASS_VERSION', type : 'integer',
-        value : 1,
-        description : 'Class version to register with Cereal'
-      )
+option(
+    'BMC_DUMP_OBJ_ENTRY',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/bmc/entry',
+    description: 'The BMC dump entry D-Bus object path',
+)
 
-option('ERROR_MAP_YAML', type : 'string',
-        value : 'example_errors_watch.yaml',
-        description : 'YAML filepath containing error object paths'
-      )
+option(
+    'BMC_DUMP_PATH',
+    type: 'string',
+    value: '/var/lib/phosphor-debug-collector/dumps/',
+    description: 'Directory where bmc dumps are placed',
+)
 
-option('host-transport', type : 'string',
-        value : 'default',
-        description : 'To specify the host dump transport protocol')
+option(
+    'SYSTEMD_PSTORE_PATH',
+    type: 'string',
+    value: '/var/lib/systemd/pstore/',
+    description: 'Path to the systemd pstore directory',
+)
 
-option('openpower-dumps-extension', type: 'feature',
-        value : 'disabled',
-        description : 'Enable Open Power specific dumps'
-      )
+option(
+    'BMC_DUMP_MAX_SIZE',
+    type: 'integer',
+    value: 200,
+    description: 'Maximum size of one bmc dump in kilo bytes',
+)
 
-option('dump_rotate_config', type: 'feature',
-        value : 'disabled',
-        description : 'Enable rotate config for bmc dump'
-      )
+option(
+    'BMC_DUMP_MIN_SPACE_REQD',
+    type: 'integer',
+    value: 20,
+    description: 'Minimum space required for one bmc dump in kilo bytes',
+)
+
+option(
+    'BMC_DUMP_TOTAL_SIZE',
+    type: 'integer',
+    value: 1024,
+    description: 'Total size of the dump in kilo bytes',
+)
+
+option(
+    'ELOG_ID_PERSIST_PATH',
+    type: 'string',
+    value: '/var/lib/phosphor-debug-collector/elogid',
+    description: 'Path of file for storing elog id\'s, which have associated dumps',
+)
+
+option(
+    'CLASS_VERSION',
+    type: 'integer',
+    value: 1,
+    description: 'Class version to register with Cereal',
+)
+
+option(
+    'ERROR_MAP_YAML',
+    type: 'string',
+    value: 'example_errors_watch.yaml',
+    description: 'YAML filepath containing error object paths',
+)
+
+option(
+    'host-transport',
+    type: 'string',
+    value: 'default',
+    description: 'To specify the host dump transport protocol',
+)
+
+option(
+    'openpower-dumps-extension',
+    type: 'feature',
+    value: 'disabled',
+    description: 'Enable Open Power specific dumps',
+)
+
+option(
+    'dump_rotate_config',
+    type: 'feature',
+    value: 'disabled',
+    description: 'Enable rotate config for bmc dump',
+)
 
 # Fault log options
 
-option('FAULTLOG_DUMP_PATH', type : 'string',
-        value : '/var/lib/phosphor-debug-collector/faultlogs/',
-        description : 'Directory where fault logs are placed'
-      )
+option(
+    'FAULTLOG_DUMP_PATH',
+    type: 'string',
+    value: '/var/lib/phosphor-debug-collector/faultlogs/',
+    description: 'Directory where fault logs are placed',
+)
 
-option('FAULTLOG_DUMP_OBJPATH', type : 'string',
-        value : '/xyz/openbmc_project/dump/faultlog',
-        description : 'The fault log dump manager D-Bus object path'
-      )
+option(
+    'FAULTLOG_DUMP_OBJPATH',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/faultlog',
+    description: 'The fault log dump manager D-Bus object path',
+)
 
-option('FAULTLOG_DUMP_OBJ_ENTRY', type : 'string',
-        value : '/xyz/openbmc_project/dump/faultlog/entry',
-        description : 'The fault log dump entry D-Bus object path'
-      )
+option(
+    'FAULTLOG_DUMP_OBJ_ENTRY',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/faultlog/entry',
+    description: 'The fault log dump entry D-Bus object path',
+)
 
 # Configurations for openpower-dump extension
 
 # System dump options
 
-option('SYSTEM_DUMP_OBJPATH', type : 'string',
-        value : '/xyz/openbmc_project/dump/system',
-        description : 'The system dump manager D-Bus object path'
-      )
+option(
+    'SYSTEM_DUMP_OBJPATH',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/system',
+    description: 'The system dump manager D-Bus object path',
+)
 
-option('SYSTEM_DUMP_OBJ_ENTRY', type : 'string',
-        value : '/xyz/openbmc_project/dump/system/entry',
-        description : 'The system dump entry D-Bus object path'
-      )
+option(
+    'SYSTEM_DUMP_OBJ_ENTRY',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/system/entry',
+    description: 'The system dump entry D-Bus object path',
+)
 
 # Resource dump options
 
-option('RESOURCE_DUMP_OBJPATH', type : 'string',
-        value : '/xyz/openbmc_project/dump/resource',
-        description : 'The resource dump manager D-Bus object path'
-      )
+option(
+    'RESOURCE_DUMP_OBJPATH',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/resource',
+    description: 'The resource dump manager D-Bus object path',
+)
 
-option('RESOURCE_DUMP_OBJ_ENTRY', type : 'string',
-        value : '/xyz/openbmc_project/dump/resource/entry',
-        description : 'The resource dump entry D-Bus object path'
-      )
+option(
+    'RESOURCE_DUMP_OBJ_ENTRY',
+    type: 'string',
+    value: '/xyz/openbmc_project/dump/resource/entry',
+    description: 'The resource dump entry D-Bus object path',
+)