diff --git a/meson.build b/meson.build
index 7b9732a18e85adc935ee919d5ae189752520a660..6d1ee3dde2220917036f146f0f9cd968e35b5a8d 100644
--- a/meson.build
+++ b/meson.build
@@ -15,61 +15,54 @@ project('unity', 'c',
     version         : '2.4.3',
     license         : 'MIT',
     meson_version   : '>=0.50.0',
-    default_options : 
-    [ 
-        'werror=true',
+    default_options: [
+        'buildtype=minsize',
         'optimization=3', 
-        'warning_level=3', 
-        'b_sanitize=address,undefined', 
-        'b_lto=true', 
-        'b_lundef=true'
-    ])
-cc = meson.get_compiler('c')
-args_for_langs = 'c'
+        'warning_level=3',
+        'werror=true',
+        ]
+)
+lang = 'c'
+cc = meson.get_compiler(lang)
+
 
+##
+#
+# Meson: Add compiler flags
+#
+##
 if cc.get_id() == 'clang'
-    add_project_arguments(
-        '-Wweak-vtables', 
-        '-Wexit-time-destructors',
-        '-Wglobal-constructors', 
-        '-Wmissing-noreturn', language: args_for_langs)
+    add_project_arguments(cc.get_supported_arguments(
+            [
+            '-Wweak-vtables', '-Wexit-time-destructors',
+            '-Wglobal-constructors', '-Wmissing-noreturn' 
+            ]
+        ), language: lang)
 endif
 
 if cc.get_argument_syntax() == 'gcc'
-    add_project_arguments(
-        '-Wall', 
-        '-Wextra', 
-        '-Wunreachable-code', 
-        '-Wmissing-declarations',
-        '-Wmissing-prototypes',
-        '-Wredundant-decls',
-        '-Wundef',
-        '-Wwrite-strings',
-        '-Wformat',
-        '-Wformat-nonliteral',
-        '-Wformat-security',
-        '-Wold-style-definition',
-        '-Winit-self',
-        '-Wmissing-include-dirs',
-        '-Waddress',
-        '-Waggregate-return',
-        '-Wno-multichar',
-        '-Wdeclaration-after-statement',
-        '-Wvla',
-        '-Wpointer-arith',language: args_for_langs)
+    add_project_arguments(cc.get_supported_arguments(
+            [
+            '-Wformat', '-Waddress', '-Winit-self', '-Wno-multichar',
+            '-Wpointer-arith'       , '-Wwrite-strings'              , 
+            '-Wno-parentheses'      , '-Wno-type-limits'             , 
+            '-Wformat-security'     , '-Wunreachable-code'           , 
+            '-Waggregate-return'    , '-Wformat-nonliteral'          ,
+            '-Wmissing-prototypes'  , '-Wold-style-definition'       ,
+            '-Wmissing-declarations', '-Wmissing-include-dirs'       , 
+            '-Wno-unused-parameter' , '-Wdeclaration-after-statement'
+            ]
+        ), language: lang)
 endif
 
 if cc.get_id() == 'msvc'
-    add_project_arguments(
-        '/W4', 
-        '/w44265', 
-        '/w44061', 
-        '/w44062', 
-        '/wd4018', # implicit signed/unsigned conversion
-        '/wd4146', # unary minus on unsigned (beware INT_MIN)
-        '/wd4244', # lossy type conversion (e.g. double -> int)
-        '/wd4305', # truncating type conversion (e.g. double -> float)
-        mesno.get_supported_arguments(['/utf-8']), language: args_for_langs)
+    add_project_arguments(cc.get_supported_arguments(
+            [
+            '/w44265', '/w44061', '/w44062', 
+            '/wd4018', '/wd4146', '/wd4244',
+            '/wd4305',
+            ]
+        ), language: lang)
 endif
 
 subdir('src')
@@ -77,4 +70,4 @@ subdir('src')
 unity_dep = declare_dependency(
     version: meson.project_version(),
     link_with: unity_lib,
-    include_directories: unity_dir)
\ No newline at end of file
+    include_directories: unity_dir)