diff --git a/Content/Editor/Scripting/ScriptTemplate.h b/Content/Editor/Scripting/ScriptTemplate.h
index 61997c011..f52b767e3 100644
--- a/Content/Editor/Scripting/ScriptTemplate.h
+++ b/Content/Editor/Scripting/ScriptTemplate.h
@@ -5,6 +5,7 @@
 
 API_CLASS() class %module%%class% : public Script
 {
+API_AUTO_SERIALIZATION();
 DECLARE_SCRIPTING_TYPE(%class%);
 
     // [Script]
diff --git a/Source/Editor/Content/AssetItemConverter.cs b/Source/Editor/Content/AssetItemConverter.cs
index cad604659..bd074b4ed 100644
--- a/Source/Editor/Content/AssetItemConverter.cs
+++ b/Source/Editor/Content/AssetItemConverter.cs
@@ -26,8 +26,7 @@ namespace FlaxEditor.Content
         {
             if (reader.TokenType == JsonToken.String)
             {
-                Guid id;
-                FlaxEngine.Json.JsonSerializer.ParseID((string)reader.Value, out id);
+                FlaxEngine.Json.JsonSerializer.ParseID((string)reader.Value, out Guid id);
                 return Editor.Instance.ContentDatabase.Find(id);
             }
 
diff --git a/Source/Editor/Content/Import/ImportFileEntry.cs b/Source/Editor/Content/Import/ImportFileEntry.cs
index e14959f61..80cab94d3 100644
--- a/Source/Editor/Content/Import/ImportFileEntry.cs
+++ b/Source/Editor/Content/Import/ImportFileEntry.cs
@@ -113,8 +113,7 @@ namespace FlaxEditor.Content.Import
             extension = extension.ToLower();
 
             // Check if use overriden type
-            ImportFileEntryHandler createDelegate;
-            if (FileTypes.TryGetValue(extension, out createDelegate))
+            if (FileTypes.TryGetValue(extension, out ImportFileEntryHandler createDelegate))
                 return createDelegate(ref request);
 
             // Use default type
diff --git a/Source/Editor/Content/Import/ImportFilesDialog.cs b/Source/Editor/Content/Import/ImportFilesDialog.cs
index 2e3633d3b..c1d24f68c 100644
--- a/Source/Editor/Content/Import/ImportFilesDialog.cs
+++ b/Source/Editor/Content/Import/ImportFilesDialog.cs
@@ -32,7 +32,7 @@ namespace FlaxEditor.Content.Import
                 var result = 0;
                 for (int i = 0; i < _rootNode.ChildrenCount; i++)
                 {
-                    if (_rootNode.Children[i].Tag is ImportFileEntry fileEntry)
+                    if (_rootNode.Children[i].Tag is ImportFileEntry)
                         result++;
                 }
                 return result;
@@ -215,8 +215,7 @@ namespace FlaxEditor.Content.Import
             var entries = new List<ImportFileEntry>(_rootNode.ChildrenCount);
             for (int i = 0; i < _rootNode.ChildrenCount; i++)
             {
-                var fileEntry = _rootNode.Children[i].Tag as ImportFileEntry;
-                if (fileEntry != null)
+                if (_rootNode.Children[i].Tag is ImportFileEntry fileEntry)
                     entries.Add(fileEntry);
             }
             Editor.Instance.ContentImporting.LetThemBeImportedxD(entries);
diff --git a/Source/Editor/Content/Items/ContentItem.cs b/Source/Editor/Content/Items/ContentItem.cs
index 86741a432..2e75de940 100644
--- a/Source/Editor/Content/Items/ContentItem.cs
+++ b/Source/Editor/Content/Items/ContentItem.cs
@@ -599,7 +599,7 @@ namespace FlaxEditor.Content
         public override bool OnShowTooltip(out string text, out Vector2 location, out Rectangle area)
         {
             UpdateTooltipText();
-            var result = base.OnShowTooltip(out text, out location, out area);
+            var result = base.OnShowTooltip(out text, out _, out area);
             location = Size * new Vector2(0.9f, 0.5f);
             return result;
         }
diff --git a/Source/Editor/Content/Proxy/PrefabProxy.cs b/Source/Editor/Content/Proxy/PrefabProxy.cs
index 276bc0d30..0c4c2de6b 100644
--- a/Source/Editor/Content/Proxy/PrefabProxy.cs
+++ b/Source/Editor/Content/Proxy/PrefabProxy.cs
@@ -74,12 +74,13 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override void Create(string outputPath, object arg)
         {
-            var actor = arg as Actor;
-            if (actor == null)
+            if (!(arg is Actor actor))
             {
                 // Create default prefab root object
-                actor = new EmptyActor();
-                actor.Name = "Root";
+                actor = new EmptyActor
+                {
+                    Name = "Root"
+                };
 
                 // Cleanup it after usage
                 Object.Destroy(actor, 20.0f);
diff --git a/Source/Editor/Content/Tree/ContentTreeNode.cs b/Source/Editor/Content/Tree/ContentTreeNode.cs
index 4370bc8e7..78cc7f2b5 100644
--- a/Source/Editor/Content/Tree/ContentTreeNode.cs
+++ b/Source/Editor/Content/Tree/ContentTreeNode.cs
@@ -120,9 +120,8 @@ namespace FlaxEditor.Content
             }
             else
             {
-                QueryFilterHelper.Range[] ranges;
                 var text = Text;
-                if (QueryFilterHelper.Match(filterText, text, out ranges))
+                if (QueryFilterHelper.Match(filterText, text, out QueryFilterHelper.Range[] ranges))
                 {
                     // Update highlights
                     if (_highlights == null)
diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
index b8491abfa..3f41bb9a6 100644
--- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
@@ -33,8 +33,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var scriptsMember = type.GetProperty("Scripts");
             if (scriptsMember != ScriptMemberInfo.Null)
             {
-                var item = new ItemInfo(scriptsMember);
-                item.CustomEditor = new CustomEditorAttribute(typeof(ScriptsEditor));
+                var item = new ItemInfo(scriptsMember)
+                {
+                    CustomEditor = new CustomEditorAttribute(typeof(ScriptsEditor))
+                };
                 items.Add(item);
             }
 
@@ -195,9 +197,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
         private TreeNode CreateDiffNode(CustomEditor editor)
         {
-            var node = new TreeNode(false);
-
-            node.Tag = editor;
+            var node = new TreeNode(false)
+            {
+                Tag = editor
+            };
 
             // Removed Script
             if (editor is RemovedScriptDummy removed)
diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index f577e9bae..1e4116894 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -493,8 +493,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             var index = (int)image.Tag;
 
-            var cm = new ContextMenu();
-            cm.Tag = index;
+            var cm = new ContextMenu
+            {
+                Tag = index
+            };
             cm.AddButton("Remove", OnClickMissingRemove);
             cm.Show(image, image.Size);
         }
@@ -746,8 +748,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var scriptType = TypeUtils.GetType(script.TypeName);
             var item = scriptType.ContentItem;
 
-            var cm = new ContextMenu();
-            cm.Tag = script;
+            var cm = new ContextMenu
+            {
+                Tag = script
+            };
             cm.AddButton("Remove", OnClickRemove).Icon = Editor.Instance.Icons.Cross12;
             cm.AddButton("Move up", OnClickMoveUp).Enabled = script.OrderInParent > 0;
             cm.AddButton("Move down", OnClickMoveDown).Enabled = script.OrderInParent < script.Actor.Scripts.Length - 1;
diff --git a/Source/Editor/CustomEditors/Editors/GuidEditor.cs b/Source/Editor/CustomEditors/Editors/GuidEditor.cs
index 8ff7691b8..acb6f85de 100644
--- a/Source/Editor/CustomEditors/Editors/GuidEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/GuidEditor.cs
@@ -26,8 +26,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
         private void OnEditEnd()
         {
-            Guid value;
-            if (Guid.TryParse(_element.Text, out value))
+            if (Guid.TryParse(_element.Text, out Guid value))
             {
                 SetValue(value);
             }
diff --git a/Source/Editor/CustomEditors/Editors/QuaternionEditor.cs b/Source/Editor/CustomEditors/Editors/QuaternionEditor.cs
index c79d86a0f..338c8eca6 100644
--- a/Source/Editor/CustomEditors/Editors/QuaternionEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/QuaternionEditor.cs
@@ -63,8 +63,7 @@ namespace FlaxEditor.CustomEditors.Editors
             float z = ZElement.FloatValue.Value;
             var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding;
             var token = isSliding ? this : null;
-            Quaternion value;
-            Quaternion.Euler(x, y, z, out value);
+            Quaternion.Euler(x, y, z, out Quaternion value);
             SetValue(value, token);
         }
 
diff --git a/Source/Editor/CustomEditors/Editors/TypeEditor.cs b/Source/Editor/CustomEditors/Editors/TypeEditor.cs
index 885109c00..95b9d0f9d 100644
--- a/Source/Editor/CustomEditors/Editors/TypeEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/TypeEditor.cs
@@ -261,13 +261,17 @@ namespace FlaxEditor.CustomEditors.Editors
             // Ensure to have valid drag helpers (uses lazy init)
             if (_dragActors == null)
                 _dragActors = new DragActors(x => IsValid(TypeUtils.GetObjectType(x.Actor)));
+
             if (_dragScripts == null)
                 _dragScripts = new DragScripts(x => IsValid(TypeUtils.GetObjectType(x)));
+
             if (_dragHandlers == null)
             {
-                _dragHandlers = new DragHandlers();
-                _dragHandlers.Add(_dragActors);
-                _dragHandlers.Add(_dragScripts);
+                _dragHandlers = new DragHandlers
+                {
+                    _dragActors,
+                    _dragScripts
+                };
             }
 
             _hasValidDragOver = _dragHandlers.OnDragEnter(data) != DragDropEffect.None;
diff --git a/Source/Editor/CustomEditors/Elements/LabelElement.cs b/Source/Editor/CustomEditors/Elements/LabelElement.cs
index 4dd2b0302..d8a91b52e 100644
--- a/Source/Editor/CustomEditors/Elements/LabelElement.cs
+++ b/Source/Editor/CustomEditors/Elements/LabelElement.cs
@@ -21,8 +21,10 @@ namespace FlaxEditor.CustomEditors.Elements
         /// </summary>
         public LabelElement()
         {
-            Label = new Label(0, 0, 100, 18);
-            Label.HorizontalAlignment = TextAlignment.Near;
+            Label = new Label(0, 0, 100, 18)
+            {
+                HorizontalAlignment = TextAlignment.Near
+            };
             // TODO: auto height for label
         }
 
diff --git a/Source/Editor/GUI/ContextMenu/ContextMenu.cs b/Source/Editor/GUI/ContextMenu/ContextMenu.cs
index 45eff148e..04dded53c 100644
--- a/Source/Editor/GUI/ContextMenu/ContextMenu.cs
+++ b/Source/Editor/GUI/ContextMenu/ContextMenu.cs
@@ -193,8 +193,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuButton AddButton(string text)
         {
-            var item = new ContextMenuButton(this, text);
-            item.Parent = _panel;
+            var item = new ContextMenuButton(this, text)
+            {
+                Parent = _panel
+            };
             SortButtons();
             return item;
         }
@@ -207,8 +209,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuButton AddButton(string text, string shortKeys)
         {
-            var item = new ContextMenuButton(this, text, shortKeys);
-            item.Parent = _panel;
+            var item = new ContextMenuButton(this, text, shortKeys)
+            {
+                Parent = _panel
+            };
             SortButtons();
             return item;
         }
@@ -221,8 +225,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuButton AddButton(string text, Action clicked)
         {
-            var item = new ContextMenuButton(this, text);
-            item.Parent = _panel;
+            var item = new ContextMenuButton(this, text)
+            {
+                Parent = _panel
+            };
             item.Clicked += clicked;
             SortButtons();
             return item;
@@ -236,8 +242,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuButton AddButton(string text, Action<ContextMenuButton> clicked)
         {
-            var item = new ContextMenuButton(this, text);
-            item.Parent = _panel;
+            var item = new ContextMenuButton(this, text)
+            {
+                Parent = _panel
+            };
             item.ButtonClicked += clicked;
             SortButtons();
             return item;
@@ -252,8 +260,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuButton AddButton(string text, string shortKeys, Action clicked)
         {
-            var item = new ContextMenuButton(this, text, shortKeys);
-            item.Parent = _panel;
+            var item = new ContextMenuButton(this, text, shortKeys)
+            {
+                Parent = _panel
+            };
             item.Clicked += clicked;
             SortButtons();
             return item;
@@ -285,8 +295,10 @@ namespace FlaxEditor.GUI.ContextMenu
             var item = GetChildMenu(text);
             if (item == null)
             {
-                item = new ContextMenuChildMenu(this, text);
-                item.Parent = _panel;
+                item = new ContextMenuChildMenu(this, text)
+                {
+                    Parent = _panel
+                };
             }
 
             return item;
@@ -299,8 +311,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuChildMenu AddChildMenu(string text)
         {
-            var item = new ContextMenuChildMenu(this, text);
-            item.Parent = _panel;
+            var item = new ContextMenuChildMenu(this, text)
+            {
+                Parent = _panel
+            };
             return item;
         }
 
@@ -310,8 +324,10 @@ namespace FlaxEditor.GUI.ContextMenu
         /// <returns>Created context menu item control.</returns>
         public ContextMenuSeparator AddSeparator()
         {
-            var item = new ContextMenuSeparator(this);
-            item.Parent = _panel;
+            var item = new ContextMenuSeparator(this)
+            {
+                Parent = _panel
+            };
             return item;
         }
 
diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
index 9eb63ee48..bd16f1469 100644
--- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
+++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
@@ -113,53 +113,71 @@ namespace FlaxEditor.GUI.Dialogs
             _onClosed = pickerClosed;
 
             // Selector
-            _cSelector = new ColorSelectorWithSliders(180, 18);
-            _cSelector.Location = new Vector2(PickerMargin, PickerMargin);
+            _cSelector = new ColorSelectorWithSliders(180, 18)
+            {
+                Location = new Vector2(PickerMargin, PickerMargin),
+                Parent = this
+            };
             _cSelector.ColorChanged += x => SelectedColor = x;
-            _cSelector.Parent = this;
 
             // Red
-            _cRed = new FloatValueBox(0, _cSelector.Right + PickerMargin + RGBAMargin + ChannelTextWidth, PickerMargin, 100, 0, float.MaxValue, 0.001f);
+            _cRed = new FloatValueBox(0, _cSelector.Right + PickerMargin + RGBAMargin + ChannelTextWidth, PickerMargin, 100, 0, float.MaxValue, 0.001f)
+            {
+                Parent = this
+            };
             _cRed.ValueChanged += OnRGBAChanged;
-            _cRed.Parent = this;
 
             // Green
-            _cGreen = new FloatValueBox(0, _cRed.X, _cRed.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f);
+            _cGreen = new FloatValueBox(0, _cRed.X, _cRed.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f)
+            {
+                Parent = this
+            };
             _cGreen.ValueChanged += OnRGBAChanged;
-            _cGreen.Parent = this;
 
             // Blue
-            _cBlue = new FloatValueBox(0, _cRed.X, _cGreen.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f);
+            _cBlue = new FloatValueBox(0, _cRed.X, _cGreen.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f)
+            {
+                Parent = this
+            };
             _cBlue.ValueChanged += OnRGBAChanged;
-            _cBlue.Parent = this;
 
             // Alpha
-            _cAlpha = new FloatValueBox(0, _cRed.X, _cBlue.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f);
+            _cAlpha = new FloatValueBox(0, _cRed.X, _cBlue.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f) 
+            {
+                Parent = this
+            };
             _cAlpha.ValueChanged += OnRGBAChanged;
-            _cAlpha.Parent = this;
 
             // Hue
-            _cHue = new FloatValueBox(0, PickerMargin + HSVMargin + ChannelTextWidth, _cSelector.Bottom + PickerMargin, 100, 0, 360);
+            _cHue = new FloatValueBox(0, PickerMargin + HSVMargin + ChannelTextWidth, _cSelector.Bottom + PickerMargin, 100, 0, 360)
+            {
+                Parent = this
+            };
             _cHue.ValueChanged += OnHSVChanged;
-            _cHue.Parent = this;
 
             // Saturation
-            _cSaturation = new FloatValueBox(0, _cHue.X, _cHue.Bottom + ChannelsMargin, _cHue.Width, 0, 100.0f, 0.1f);
+            _cSaturation = new FloatValueBox(0, _cHue.X, _cHue.Bottom + ChannelsMargin, _cHue.Width, 0, 100.0f, 0.1f)
+            {
+                Parent = this
+            };
             _cSaturation.ValueChanged += OnHSVChanged;
-            _cSaturation.Parent = this;
 
             // Value
-            _cValue = new FloatValueBox(0, _cHue.X, _cSaturation.Bottom + ChannelsMargin, _cHue.Width, 0, float.MaxValue, 0.1f);
+            _cValue = new FloatValueBox(0, _cHue.X, _cSaturation.Bottom + ChannelsMargin, _cHue.Width, 0, float.MaxValue, 0.1f)
+            {
+                Parent = this
+            };
             _cValue.ValueChanged += OnHSVChanged;
-            _cValue.Parent = this;
 
             // Set valid dialog size based on UI content
             _dialogSize = Size = new Vector2(_cRed.Right + PickerMargin, 300);
 
             // Hex
             const float hexTextBoxWidth = 80;
-            _cHex = new TextBox(false, Width - hexTextBoxWidth - PickerMargin, _cSelector.Bottom + PickerMargin, hexTextBoxWidth);
-            _cHex.Parent = this;
+            _cHex = new TextBox(false, Width - hexTextBoxWidth - PickerMargin, _cSelector.Bottom + PickerMargin, hexTextBoxWidth)
+            {
+                Parent = this
+            };
             _cHex.EditEnd += OnHexChanged;
 
             // Cancel
@@ -233,8 +251,7 @@ namespace FlaxEditor.GUI.Dialogs
             if (_disableEvents)
                 return;
 
-            Color color;
-            if (Color.TryParseHex(_cHex.Text, out color))
+            if (Color.TryParseHex(_cHex.Text, out Color color))
                 SelectedColor = color;
         }
 
diff --git a/Source/Editor/GUI/Docking/DockPanel.cs b/Source/Editor/GUI/Docking/DockPanel.cs
index f6e10e653..2865515da 100644
--- a/Source/Editor/GUI/Docking/DockPanel.cs
+++ b/Source/Editor/GUI/Docking/DockPanel.cs
@@ -597,8 +597,10 @@ namespace FlaxEditor.GUI.Docking
             if (_tabsProxy == null)
             {
                 // Create proxy and make set simple full dock
-                _tabsProxy = new DockPanelProxy(this);
-                _tabsProxy.Parent = this;
+                _tabsProxy = new DockPanelProxy(this)
+                {
+                    Parent = this
+                };
                 _tabsProxy.UnlockChildrenRecursive();
             }
         }
diff --git a/Source/Editor/GUI/Docking/DockPanelProxy.cs b/Source/Editor/GUI/Docking/DockPanelProxy.cs
index 748ae726c..ec8faead4 100644
--- a/Source/Editor/GUI/Docking/DockPanelProxy.cs
+++ b/Source/Editor/GUI/Docking/DockPanelProxy.cs
@@ -402,8 +402,7 @@ namespace FlaxEditor.GUI.Docking
                 else if (MouseDownWindow != null && _panel.TabsCount > 1)
                 {
                     // Check if mouse left current tab rect
-                    Rectangle currWinRect;
-                    GetTabRect(MouseDownWindow, out currWinRect);
+                    GetTabRect(MouseDownWindow, out Rectangle currWinRect);
                     if (!currWinRect.Contains(location))
                     {
                         int index = _panel.GetTabIndex(MouseDownWindow);
@@ -496,8 +495,10 @@ namespace FlaxEditor.GUI.Docking
 
         private void ShowContextMenu(DockWindow tab, ref Vector2 location)
         {
-            var menu = new ContextMenu.ContextMenu();
-            menu.Tag = tab;
+            var menu = new ContextMenu.ContextMenu
+            {
+                Tag = tab
+            };
             tab.OnShowContextMenu(menu);
             menu.AddButton("Close", OnTabMenuCloseClicked);
             menu.AddButton("Close All", OnTabMenuCloseAllClicked);
diff --git a/Source/Editor/GUI/Docking/DockWindow.cs b/Source/Editor/GUI/Docking/DockWindow.cs
index 56c78efed..0c7f70ffc 100644
--- a/Source/Editor/GUI/Docking/DockWindow.cs
+++ b/Source/Editor/GUI/Docking/DockWindow.cs
@@ -134,7 +134,7 @@ namespace FlaxEditor.GUI.Docking
             });
 
             // Link to the master panel
-            _masterPanel?.linkWindow(this);
+            _masterPanel?.LinkWindow(this);
         }
 
         /// <summary>
@@ -409,7 +409,7 @@ namespace FlaxEditor.GUI.Docking
                 Undock();
 
             // Unlink from the master panel
-            _masterPanel?.unlinkWindow(this);
+            _masterPanel?.UnlinkWindow(this);
 
             base.OnDestroy();
         }
diff --git a/Source/Editor/GUI/Docking/MasterDockPanel.cs b/Source/Editor/GUI/Docking/MasterDockPanel.cs
index a560de195..0293ec0cc 100644
--- a/Source/Editor/GUI/Docking/MasterDockPanel.cs
+++ b/Source/Editor/GUI/Docking/MasterDockPanel.cs
@@ -97,13 +97,13 @@ namespace FlaxEditor.GUI.Docking
             return base.HitTest(ref position);
         }
 
-        internal void linkWindow(DockWindow window)
+        internal void LinkWindow(DockWindow window)
         {
             // Add to the windows list
             Windows.Add(window);
         }
 
-        internal void unlinkWindow(DockWindow window)
+        internal void UnlinkWindow(DockWindow window)
         {
             // Call event to the window
             window.OnUnlinkInternal();
diff --git a/Source/Editor/GUI/Drag/DragActors.cs b/Source/Editor/GUI/Drag/DragActors.cs
index 1948c91e9..437c7d3d0 100644
--- a/Source/Editor/GUI/Drag/DragActors.cs
+++ b/Source/Editor/GUI/Drag/DragActors.cs
@@ -112,8 +112,7 @@ namespace FlaxEditor.GUI.Drag
                     for (int i = 0; i < ids.Length; i++)
                     {
                         // Find element
-                        Guid id;
-                        if (Guid.TryParse(ids[i], out id))
+                        if (Guid.TryParse(ids[i], out Guid id))
                         {
                             var obj = Editor.Instance.Scene.GetActorNode(id);
 
diff --git a/Source/Editor/GUI/Drag/DragScripts.cs b/Source/Editor/GUI/Drag/DragScripts.cs
index 38899abbf..d1351f321 100644
--- a/Source/Editor/GUI/Drag/DragScripts.cs
+++ b/Source/Editor/GUI/Drag/DragScripts.cs
@@ -98,8 +98,7 @@ namespace FlaxEditor.GUI.Drag
                     for (int i = 0; i < ids.Length; i++)
                     {
                         // Find element
-                        Guid id;
-                        if (Guid.TryParse(ids[i], out id))
+                        if (Guid.TryParse(ids[i], out Guid id))
                         {
                             var obj = FlaxEngine.Object.Find<Script>(ref id);
 
@@ -129,8 +128,7 @@ namespace FlaxEditor.GUI.Drag
                 for (int i = 0; i < ids.Length; i++)
                 {
                     // Find element
-                    Guid id;
-                    if (Guid.TryParse(ids[i], out id))
+                    if (Guid.TryParse(ids[i], out Guid id))
                     {
                         var obj = FlaxEngine.Object.Find<Script>(ref id);
 
diff --git a/Source/Editor/GUI/Input/LongValueBox.cs b/Source/Editor/GUI/Input/LongValueBox.cs
index 498d58d07..74674caf5 100644
--- a/Source/Editor/GUI/Input/LongValueBox.cs
+++ b/Source/Editor/GUI/Input/LongValueBox.cs
@@ -117,8 +117,7 @@ namespace FlaxEditor.GUI.Input
         protected override void TryGetValue()
         {
             // Try to parse long
-            long value;
-            if (long.TryParse(Text, out value))
+            if (long.TryParse(Text, out long value))
             {
                 // Set value
                 Value = value;
diff --git a/Source/Editor/GUI/MainMenu.cs b/Source/Editor/GUI/MainMenu.cs
index 0e5bb54b2..ff4e02c4b 100644
--- a/Source/Editor/GUI/MainMenu.cs
+++ b/Source/Editor/GUI/MainMenu.cs
@@ -250,6 +250,7 @@ namespace FlaxEditor.GUI
             {
                 if (b == null && control is MainMenuButton)
                     b = (MainMenuButton)control;
+
                 if (control is MainMenuButton && control.Right > b.Right)
                     b = (MainMenuButton)control;
             }
diff --git a/Source/Editor/GUI/PrefabDiffContextMenu.cs b/Source/Editor/GUI/PrefabDiffContextMenu.cs
index 9f40b11fb..8adda75e5 100644
--- a/Source/Editor/GUI/PrefabDiffContextMenu.cs
+++ b/Source/Editor/GUI/PrefabDiffContextMenu.cs
@@ -41,13 +41,19 @@ namespace FlaxEditor.GUI
             // Buttons
             float buttonsWidth = (width - 6.0f) * 0.5f;
             float buttonsHeight = 20.0f;
-            var revertAll = new Button(2.0f, 2.0f, buttonsWidth, buttonsHeight);
-            revertAll.Text = "Revert All";
-            revertAll.Parent = this;
+
+            var revertAll = new Button(2.0f, 2.0f, buttonsWidth, buttonsHeight)
+            {
+                Text = "Revert All",
+                Parent = this
+            };
             revertAll.Clicked += OnRevertAllClicked;
-            var applyAll = new Button(revertAll.Right + 2.0f, 2.0f, buttonsWidth, buttonsHeight);
-            applyAll.Text = "Apply All";
-            applyAll.Parent = this;
+
+            var applyAll = new Button(revertAll.Right + 2.0f, 2.0f, buttonsWidth, buttonsHeight)
+            {
+                Text = "Apply All",
+                Parent = this
+            };
             applyAll.Clicked += OnApplyAllClicked;
 
             // Actual panel
@@ -56,6 +62,7 @@ namespace FlaxEditor.GUI
                 Bounds = new Rectangle(0, applyAll.Bottom + 2.0f, Width, Height - applyAll.Bottom - 2.0f),
                 Parent = this
             };
+
             Tree = new Tree.Tree
             {
                 AnchorPreset = AnchorPresets.HorizontalStretchTop,
diff --git a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs
index 2a4a42ebc..0c3ab7851 100644
--- a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs
@@ -96,17 +96,17 @@ namespace FlaxEditor.GUI.Timeline.Tracks
         /// <param name="req">The request data.</param>
         public void OnThumbnailRenderingBegin(SceneRenderTask task, GPUContext context, ref CameraCutThumbnailRenderer.Request req)
         {
-            var view = new RenderView();
+            RenderView view = new RenderView();
             var track = (CameraCutTrack)Track;
-            var cam = track.Camera;
+            Camera cam = track.Camera;
             var viewport = new FlaxEngine.Viewport(Vector2.Zero, task.Buffers.Size);
-            var orientation = Quaternion.Identity;
+            Quaternion orientation = Quaternion.Identity;
             view.Near = 10.0f;
             view.Far = 20000.0f;
-            var usePerspective = true;
-            var orthoScale = 1.0f;
-            var fov = 60.0f;
-            var customAspectRatio = 0.0f;
+            bool usePerspective = true;
+            float orthoScale = 1.0f;
+            float fov = 60.0f;
+            float customAspectRatio = 0.0f;
 
             // Try to evaluate camera properties based on the initial camera state
             if (cam)
@@ -122,7 +122,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             }
 
             // Try to evaluate camera properties based on the animated tracks
-            var time = req.ThumbnailIndex == 0 ? Start : Start + Duration;
+            float time = req.ThumbnailIndex == 0 ? Start : Start + Duration;
             foreach (var subTrack in track.SubTracks)
             {
                 if (subTrack is MemberTrack memberTrack)
@@ -133,18 +133,25 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                         // TODO: try to make it better
                         if (memberTrack.MemberName == "Position" && value is Vector3 asPosition)
                             view.Position = asPosition;
+
                         else if (memberTrack.MemberName == "Orientation" && value is Quaternion asRotation)
                             orientation = asRotation;
+
                         else if (memberTrack.MemberName == "NearPlane" && value is float asNearPlane)
                             view.Near = asNearPlane;
+
                         else if (memberTrack.MemberName == "FarPlane" && value is float asFarPlane)
                             view.Far = asFarPlane;
+
                         else if (memberTrack.MemberName == "UsePerspective" && value is bool asUsePerspective)
                             usePerspective = asUsePerspective;
+
                         else if (memberTrack.MemberName == "FieldOfView" && value is float asFieldOfView)
                             fov = asFieldOfView;
+
                         else if (memberTrack.MemberName == "CustomAspectRatio" && value is float asCustomAspectRatio)
                             customAspectRatio = asCustomAspectRatio;
+
                         else if (memberTrack.MemberName == "OrthographicScale" && value is float asOrthographicScale)
                             orthoScale = asOrthographicScale;
                     }
@@ -162,6 +169,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             {
                 view.Projection = Matrix.Ortho(viewport.Width * orthoScale, viewport.Height * orthoScale, view.Near, view.Far);
             }
+
             Vector3 target = view.Position + view.Direction;
             var up = Vector3.Transform(Vector3.Up, orientation);
             view.View = Matrix.LookAt(view.Position, target, up);
@@ -186,19 +194,23 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             if (image == null)
             {
                 if (req.ThumbnailIndex == 0)
+                {
                     image = new Image
                     {
                         AnchorPreset = AnchorPresets.MiddleLeft,
                         Parent = this,
                         Bounds = new Rectangle(2, 2, CameraCutThumbnailRenderer.Width, CameraCutThumbnailRenderer.Height),
                     };
+                }
                 else
+                {
                     image = new Image
                     {
                         AnchorPreset = AnchorPresets.MiddleRight,
                         Parent = this,
                         Bounds = new Rectangle(Width - 2 - CameraCutThumbnailRenderer.Width, 2, CameraCutThumbnailRenderer.Width, CameraCutThumbnailRenderer.Height),
                     };
+                }
                 image.UnlockChildrenRecursive();
                 _thumbnails[req.ThumbnailIndex] = image;
                 UpdateUI();
diff --git a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
index 683458b16..cdd6fc83f 100644
--- a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
@@ -72,8 +72,11 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             {
                 var time = stream.ReadSingle();
 
-                var key = new EventKey();
-                key.Parameters = new object[paramsCount];
+                var key = new EventKey
+                {
+                    Parameters = new object[paramsCount]
+                };
+
                 for (int j = 0; j < paramsCount; j++)
                 {
                     stream.Read(dataBuffer, 0, e.EventParamsSizes[j]);
@@ -316,8 +319,11 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             }
 
             // Build default value
-            var defaultValue = new EventKey();
-            defaultValue.Parameters = new object[EventParamsTypes.Length];
+            var defaultValue = new EventKey
+            {
+                Parameters = new object[EventParamsTypes.Length]
+            };
+
             for (int i = 0; i < EventParamsTypes.Length; i++)
                 defaultValue.Parameters[i] = Activator.CreateInstance(EventParamsTypes[i]);
             Events.DefaultValue = defaultValue;
diff --git a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs
index e7fa9e0ba..2a5b1554c 100644
--- a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs
@@ -68,7 +68,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             var e = (ParticleEmitterTrack)track;
             Guid id = new Guid(stream.ReadBytes(16));
             e.Asset = FlaxEngine.Content.LoadAsync<ParticleEmitter>(id);
-            var emitterIndex = stream.ReadInt32();
+            stream.ReadInt32(); // Skip emitterIndex
             var m = e.TrackMedia;
             m.StartFrame = stream.ReadInt32();
             m.DurationFrames = stream.ReadInt32();
diff --git a/Source/Editor/GUI/Tree/Tree.cs b/Source/Editor/GUI/Tree/Tree.cs
index 99aaabcf5..8789585ac 100644
--- a/Source/Editor/GUI/Tree/Tree.cs
+++ b/Source/Editor/GUI/Tree/Tree.cs
@@ -297,7 +297,7 @@ namespace FlaxEditor.GUI.Tree
             }
         }
 
-        private void walkSelectExpandedTree(List<TreeNode> selection, TreeNode node)
+        private void WalkSelectExpandedTree(List<TreeNode> selection, TreeNode node)
         {
             for (int i = 0; i < node.ChildrenCount; i++)
             {
@@ -305,7 +305,7 @@ namespace FlaxEditor.GUI.Tree
                 {
                     selection.Add(child);
                     if (child.IsExpanded)
-                        walkSelectExpandedTree(selection, child);
+                        WalkSelectExpandedTree(selection, child);
                 }
             }
         }
@@ -322,7 +322,7 @@ namespace FlaxEditor.GUI.Tree
 
                 // Update selection
                 Selection.Clear();
-                walkSelectExpandedTree(Selection, _children[0] as TreeNode);
+                WalkSelectExpandedTree(Selection, _children[0] as TreeNode);
 
                 // Check if changed
                 if (Selection.Count != prev.Count || !Selection.SequenceEqual(prev))
diff --git a/Source/Editor/Gizmo/TransformGizmoBase.Selection.cs b/Source/Editor/Gizmo/TransformGizmoBase.Selection.cs
index d39447a34..c1f7d1d0d 100644
--- a/Source/Editor/Gizmo/TransformGizmoBase.Selection.cs
+++ b/Source/Editor/Gizmo/TransformGizmoBase.Selection.cs
@@ -29,7 +29,6 @@ namespace FlaxEditor.Gizmo
         
         private bool IntersectsRotateCircle(Vector3 normal, ref Ray ray, out float distance)
         {
-            distance = float.MaxValue;
             var plane = new Plane(Vector3.Zero, normal);
 
             if (!plane.Intersects(ref ray, out distance))
@@ -47,8 +46,7 @@ namespace FlaxEditor.Gizmo
 
             // Transform ray into local space of the gizmo
             Ray localRay;
-            Matrix invGizmoWorld;
-            Matrix.Invert(ref _gizmoWorld, out invGizmoWorld);
+            Matrix.Invert(ref _gizmoWorld, out Matrix invGizmoWorld);
             Vector3.TransformNormal(ref ray.Direction, ref invGizmoWorld, out localRay.Direction);
             Vector3.Transform(ref ray.Position, ref invGizmoWorld, out localRay.Position);
 
@@ -66,11 +64,13 @@ namespace FlaxEditor.Gizmo
                     _activeAxis = Axis.X;
                     closestintersection = intersection;
                 }
+
                 if (YAxisBox.Intersects(ref localRay, out intersection) && intersection < closestintersection)
                 {
                     _activeAxis = Axis.Y;
                     closestintersection = intersection;
                 }
+
                 if (ZAxisBox.Intersects(ref localRay, out intersection) && intersection < closestintersection)
                 {
                     _activeAxis = Axis.Z;
@@ -85,6 +85,7 @@ namespace FlaxEditor.Gizmo
                     _activeAxis = Axis.XY;
                     closestintersection = intersection;
                 }
+
                 if (XZBox.Intersects(ref localRay, out intersection) && intersection > closestintersection)
                 {
                     _activeAxis = Axis.ZX;
diff --git a/Source/Editor/Gizmo/TransformGizmoBase.cs b/Source/Editor/Gizmo/TransformGizmoBase.cs
index 014143685..8c997bc2c 100644
--- a/Source/Editor/Gizmo/TransformGizmoBase.cs
+++ b/Source/Editor/Gizmo/TransformGizmoBase.cs
@@ -157,9 +157,8 @@ namespace FlaxEditor.Gizmo
             _screenScale = vLength.Length / GizmoScaleFactor * gizmoSize;
             Matrix.Scaling(_screenScale, out _screenScaleMatrix);
 
-            Matrix rotation;
             Quaternion orientation = GetSelectedObject(0).Orientation;
-            Matrix.RotationQuaternion(ref orientation, out rotation);
+            Matrix.RotationQuaternion(ref orientation, out Matrix rotation);
             _localForward = rotation.Forward;
             _localUp = rotation.Up;
 
diff --git a/Source/Editor/Modules/ContentImportingModule.cs b/Source/Editor/Modules/ContentImportingModule.cs
index 0c934f130..d5ec4b69f 100644
--- a/Source/Editor/Modules/ContentImportingModule.cs
+++ b/Source/Editor/Modules/ContentImportingModule.cs
@@ -124,8 +124,7 @@ namespace FlaxEditor.Modules
         /// <param name="skipSettingsDialog">True if skip any popup dialogs showing for import options adjusting. Can be used when importing files from code.</param>
         public void Reimport(BinaryAssetItem item, object settings = null, bool skipSettingsDialog = false)
         {
-            string importPath;
-            if (item != null && !item.GetImportPath(out importPath))
+            if (item != null && !item.GetImportPath(out string importPath))
             {
                 // Check if input file is missing
                 if (!System.IO.File.Exists(importPath))
diff --git a/Source/Editor/Modules/SceneModule.cs b/Source/Editor/Modules/SceneModule.cs
index 9fd860a51..6334225fd 100644
--- a/Source/Editor/Modules/SceneModule.cs
+++ b/Source/Editor/Modules/SceneModule.cs
@@ -138,8 +138,11 @@ namespace FlaxEditor.Modules
         public void CreateSceneFile(string path)
         {
             // Create a sample scene
-            var scene = new Scene();
-            scene.StaticFlags = StaticFlags.FullyStatic;
+            var scene = new Scene
+            {
+                StaticFlags = StaticFlags.FullyStatic
+            };
+
             //
             var sun = scene.AddChild<DirectionalLight>();
             sun.Name = "Sun";
diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index e875b1fd3..8f8648c88 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -380,8 +380,10 @@ namespace FlaxEditor.Modules
 
         private void InitMainMenu(RootControl mainWindow)
         {
-            MainMenu = new MainMenu(mainWindow);
-            MainMenu.Parent = mainWindow;
+            MainMenu = new MainMenu(mainWindow)
+            {
+                Parent = mainWindow
+            };
 
             // File
             MenuFile = MainMenu.AddButton("File");
diff --git a/Source/Editor/Modules/WindowsModule.cs b/Source/Editor/Modules/WindowsModule.cs
index 4cb3d242b..f38f6fe3b 100644
--- a/Source/Editor/Modules/WindowsModule.cs
+++ b/Source/Editor/Modules/WindowsModule.cs
@@ -415,8 +415,7 @@ namespace FlaxEditor.Modules
 
                 writer.WriteStartElement("Panel");
 
-                float splitterValue;
-                DockState state = p.TryGetDockState(out splitterValue);
+                DockState state = p.TryGetDockState(out float splitterValue);
 
                 writer.WriteAttributeString("DockState", ((int)state).ToString());
                 writer.WriteAttributeString("SplitterValue", splitterValue.ToString(CultureInfo.InvariantCulture));
@@ -684,8 +683,7 @@ namespace FlaxEditor.Modules
             }
 
             // Check if it's an asset ID
-            Guid id;
-            if (Guid.TryParse(typename, out id))
+            if (Guid.TryParse(typename, out Guid id))
             {
                 var el = Editor.ContentDatabase.Find(id);
                 if (el != null)
diff --git a/Source/Editor/Options/Editor.cs b/Source/Editor/Options/Editor.cs
index 539cef444..0309187cd 100644
--- a/Source/Editor/Options/Editor.cs
+++ b/Source/Editor/Options/Editor.cs
@@ -21,9 +21,11 @@ namespace FlaxEditor.Options
             // Reset options button
             layout.Space(30);
             var panel = layout.Space(30);
-            var resetButton = new Button(4, 4, 100);
-            resetButton.Text = "Reset";
-            resetButton.Parent = panel.ContainerControl;
+            var resetButton = new Button(4, 4, 100)
+            {
+                Text = "Reset",
+                Parent = panel.ContainerControl
+            };
             resetButton.Clicked += OnResetButtonClicked;
         }
 
diff --git a/Source/Editor/Options/OptionsModule.cs b/Source/Editor/Options/OptionsModule.cs
index 3c501de85..62496823c 100644
--- a/Source/Editor/Options/OptionsModule.cs
+++ b/Source/Editor/Options/OptionsModule.cs
@@ -212,46 +212,47 @@ namespace FlaxEditor.Options
         /// <returns>The style object.</returns>
         public Style CreateDefaultStyle()
         {
-            var style = new Style();
-
             // Metro Style colors
-            style.Background = Color.FromBgra(0xFF1C1C1C);
-            style.LightBackground = Color.FromBgra(0xFF2D2D30);
-            style.Foreground = Color.FromBgra(0xFFFFFFFF);
-            style.ForegroundGrey = Color.FromBgra(0xFFA9A9B3);
-            style.ForegroundDisabled = Color.FromBgra(0xFF787883);
-            style.BackgroundHighlighted = Color.FromBgra(0xFF54545C);
-            style.BorderHighlighted = Color.FromBgra(0xFF6A6A75);
-            style.BackgroundSelected = Color.FromBgra(0xFF007ACC);
-            style.BorderSelected = Color.FromBgra(0xFF1C97EA);
-            style.BackgroundNormal = Color.FromBgra(0xFF3F3F46);
-            style.BorderNormal = Color.FromBgra(0xFF54545C);
-            style.TextBoxBackground = Color.FromBgra(0xFF333337);
-            style.TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46);
-            style.DragWindow = style.BackgroundSelected * 0.7f;
-            style.ProgressNormal = Color.FromBgra(0xFF0ad328);
-
-            // Fonts
             var options = Options;
-            style.FontTitle = options.Interface.TitleFont.GetFont();
-            style.FontLarge = options.Interface.LargeFont.GetFont();
-            style.FontMedium = options.Interface.MediumFont.GetFont();
-            style.FontSmall = options.Interface.SmallFont.GetFont();
+            var style = new Style
+            {
+                Background = Color.FromBgra(0xFF1C1C1C),
+                LightBackground = Color.FromBgra(0xFF2D2D30),
+                Foreground = Color.FromBgra(0xFFFFFFFF),
+                ForegroundGrey = Color.FromBgra(0xFFA9A9B3),
+                ForegroundDisabled = Color.FromBgra(0xFF787883),
+                BackgroundHighlighted = Color.FromBgra(0xFF54545C),
+                BorderHighlighted = Color.FromBgra(0xFF6A6A75),
+                BackgroundSelected = Color.FromBgra(0xFF007ACC),
+                BorderSelected = Color.FromBgra(0xFF1C97EA),
+                BackgroundNormal = Color.FromBgra(0xFF3F3F46),
+                BorderNormal = Color.FromBgra(0xFF54545C),
+                TextBoxBackground = Color.FromBgra(0xFF333337),
+                TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46),
+                ProgressNormal = Color.FromBgra(0xFF0ad328),
 
-            // Icons
-            style.ArrowDown = Editor.Icons.ArrowDown12;
-            style.ArrowRight = Editor.Icons.ArrowRight12;
-            style.Search = Editor.Icons.Search12;
-            style.Settings = Editor.Icons.Settings12;
-            style.Cross = Editor.Icons.Cross12;
-            style.CheckBoxIntermediate = Editor.Icons.CheckBoxIntermediate12;
-            style.CheckBoxTick = Editor.Icons.CheckBoxTick12;
-            style.StatusBarSizeGrip = Editor.Icons.StatusBarSizeGrip12;
-            style.Translate = Editor.Icons.Translate16;
-            style.Rotate = Editor.Icons.Rotate16;
-            style.Scale = Editor.Icons.Scale16;
+                // Fonts
+                FontTitle = options.Interface.TitleFont.GetFont(),
+                FontLarge = options.Interface.LargeFont.GetFont(),
+                FontMedium = options.Interface.MediumFont.GetFont(),
+                FontSmall = options.Interface.SmallFont.GetFont(),
 
-            style.SharedTooltip = new Tooltip();
+                // Icons
+                ArrowDown = Editor.Icons.ArrowDown12,
+                ArrowRight = Editor.Icons.ArrowRight12,
+                Search = Editor.Icons.Search12,
+                Settings = Editor.Icons.Settings12,
+                Cross = Editor.Icons.Cross12,
+                CheckBoxIntermediate = Editor.Icons.CheckBoxIntermediate12,
+                CheckBoxTick = Editor.Icons.CheckBoxTick12,
+                StatusBarSizeGrip = Editor.Icons.StatusBarSizeGrip12,
+                Translate = Editor.Icons.Translate16,
+                Rotate = Editor.Icons.Rotate16,
+                Scale = Editor.Icons.Scale16,
+
+                SharedTooltip = new Tooltip()
+            };
+            style.DragWindow = style.BackgroundSelected * 0.7f;
 
             return style;
         }
diff --git a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
index e04dd7741..7b4b35ed1 100644
--- a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
+++ b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
@@ -125,9 +125,8 @@ namespace FlaxEditor.SceneGraph.GUI
             }
             else
             {
-                QueryFilterHelper.Range[] ranges;
                 var text = Text;
-                if (QueryFilterHelper.Match(filterText, text, out ranges))
+                if (QueryFilterHelper.Match(filterText, text, out QueryFilterHelper.Range[] ranges))
                 {
                     // Update highlights
                     if (_highlights == null)
@@ -386,15 +385,14 @@ namespace FlaxEditor.SceneGraph.GUI
 
             public ReparentAction(List<Actor> actors)
             {
-                var allActors = new List<Actor>();
-                allActors.Capacity = Mathf.NextPowerOfTwo(actors.Count);
+                var allActors = new List<Actor>(Mathf.NextPowerOfTwo(actors.Count));
+
                 for (int i = 0; i < actors.Count; i++)
                 {
                     GetAllActors(allActors, actors[i]);
                 }
 
-                var allScripts = new List<Script>();
-                allScripts.Capacity = allActors.Capacity;
+                var allScripts = new List<Script>(allActors.Capacity);
                 GetAllScripts(allActors, allScripts);
 
                 int allCount = allActors.Count + allScripts.Count;
@@ -409,6 +407,7 @@ namespace FlaxEditor.SceneGraph.GUI
                     _prefabIds[i] = allActors[i].PrefabID;
                     _prefabObjectIds[i] = allActors[i].PrefabObjectID;
                 }
+
                 for (int i = 0; i < allScripts.Count; i++)
                 {
                     int j = _actorsCount + i;
@@ -570,11 +569,14 @@ namespace FlaxEditor.SceneGraph.GUI
                     {
                         // Create actor
                         var model = FlaxEngine.Content.LoadAsync<SkinnedModel>(assetItem.ID);
-                        var actor = new AnimatedModel();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.SkinnedModel = model;
-                        actor.Transform = Actor.Transform;
+
+                        var actor = new AnimatedModel
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            SkinnedModel = model,
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -583,11 +585,14 @@ namespace FlaxEditor.SceneGraph.GUI
                     {
                         // Create actor
                         var model = FlaxEngine.Content.LoadAsync<Model>(assetItem.ID);
-                        var actor = new StaticModel();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.Model = model;
-                        actor.Transform = Actor.Transform;
+
+                        var actor = new StaticModel
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            Model = model,
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -595,11 +600,13 @@ namespace FlaxEditor.SceneGraph.GUI
                     else if (assetItem.IsOfType<CollisionData>())
                     {
                         // Create actor
-                        var actor = new MeshCollider();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.CollisionData = FlaxEngine.Content.LoadAsync<CollisionData>(assetItem.ID);
-                        actor.Transform = Actor.Transform;
+                        var actor = new MeshCollider
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            CollisionData = FlaxEngine.Content.LoadAsync<CollisionData>(assetItem.ID),
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -607,11 +614,13 @@ namespace FlaxEditor.SceneGraph.GUI
                     else if (assetItem.IsOfType<ParticleSystem>())
                     {
                         // Create actor
-                        var actor = new ParticleEffect();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.ParticleSystem = FlaxEngine.Content.LoadAsync<ParticleSystem>(assetItem.ID);
-                        actor.Transform = Actor.Transform;
+                        var actor = new ParticleEffect
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            ParticleSystem = FlaxEngine.Content.LoadAsync<ParticleSystem>(assetItem.ID),
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -619,11 +628,13 @@ namespace FlaxEditor.SceneGraph.GUI
                     else if (assetItem.IsOfType<SceneAnimation>())
                     {
                         // Create actor
-                        var actor = new SceneAnimationPlayer();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.Animation = FlaxEngine.Content.LoadAsync<SceneAnimation>(assetItem.ID);
-                        actor.Transform = Actor.Transform;
+                        var actor = new SceneAnimationPlayer
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            Animation = FlaxEngine.Content.LoadAsync<SceneAnimation>(assetItem.ID),
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -631,11 +642,13 @@ namespace FlaxEditor.SceneGraph.GUI
                     else if (assetItem.IsOfType<AudioClip>())
                     {
                         // Create actor
-                        var actor = new AudioSource();
-                        actor.StaticFlags = Actor.StaticFlags;
-                        actor.Name = assetItem.ShortName;
-                        actor.Clip = FlaxEngine.Content.LoadAsync<AudioClip>(assetItem.ID);
-                        actor.Transform = Actor.Transform;
+                        var actor = new AudioSource
+                        {
+                            StaticFlags = Actor.StaticFlags,
+                            Name = assetItem.ShortName,
+                            Clip = FlaxEngine.Content.LoadAsync<AudioClip>(assetItem.ID),
+                            Transform = Actor.Transform
+                        };
 
                         // Spawn
                         ActorNode.Root.Spawn(actor, Actor);
@@ -728,20 +741,28 @@ namespace FlaxEditor.SceneGraph.GUI
         {
             if (assetItem.IsOfType<SkinnedModel>())
                 return true;
+
             if (assetItem.IsOfType<Model>())
                 return true;
+
             if (assetItem.IsOfType<AudioClip>())
                 return true;
+
             if (assetItem.IsOfType<Prefab>())
                 return true;
+
             if (assetItem.IsOfType<CollisionData>())
                 return true;
+
             if (assetItem.IsOfType<ParticleSystem>())
                 return true;
+
             if (assetItem.IsOfType<SceneAnimation>())
                 return true;
+
             if (assetItem is VisualScriptItem visualScriptItem && new ScriptType(typeof(Actor)).IsAssignableFrom(visualScriptItem.ScriptType) && visualScriptItem.ScriptType.CanCreateInstance)
                 return true;
+
             return false;
         }
 
diff --git a/Source/Editor/SceneGraph/SceneGraphFactory.cs b/Source/Editor/SceneGraph/SceneGraphFactory.cs
index 8103f5f05..9d4751bd9 100644
--- a/Source/Editor/SceneGraph/SceneGraphFactory.cs
+++ b/Source/Editor/SceneGraph/SceneGraphFactory.cs
@@ -82,8 +82,7 @@ namespace FlaxEditor.SceneGraph
             if (id == Guid.Empty)
                 return null;
 
-            SceneGraphNode result;
-            Nodes.TryGetValue(id, out result);
+            Nodes.TryGetValue(id, out SceneGraphNode result);
             return result;
         }
 
@@ -94,8 +93,7 @@ namespace FlaxEditor.SceneGraph
         /// <returns>The result node.</returns>
         public static SceneGraphNode GetNode(Guid id)
         {
-            SceneGraphNode result;
-            Nodes.TryGetValue(id, out result);
+            Nodes.TryGetValue(id, out SceneGraphNode result);
             if (result == null)
             {
                 var actor = Object.TryFind<Actor>(ref id);
diff --git a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs
index 36c52f730..3f9d81f6d 100644
--- a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs
+++ b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs
@@ -396,34 +396,45 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 var layoutOffsetY = FlaxEditor.Surface.Constants.LayoutOffsetY;
 
-                _selectedAnimationLabel = new Label(300, 3 * layoutOffsetY, 120.0f, layoutOffsetY);
-                _selectedAnimationLabel.HorizontalAlignment = TextAlignment.Near;
-                _selectedAnimationLabel.Text = "Selected Animation:";
-                _selectedAnimationLabel.Parent = this;
+                _selectedAnimationLabel = new Label(300, 3 * layoutOffsetY, 120.0f, layoutOffsetY)
+                {
+                    HorizontalAlignment = TextAlignment.Near,
+                    Text = "Selected Animation:",
+                    Parent = this
+                };
+
+                _selectedAnimation = new ComboBox(_selectedAnimationLabel.X, 4 * layoutOffsetY, _selectedAnimationLabel.Width)
+                {
+                    Parent = this
+                };
 
-                _selectedAnimation = new ComboBox(_selectedAnimationLabel.X, 4 * layoutOffsetY, _selectedAnimationLabel.Width);
                 _selectedAnimation.PopupShowing += OnSelectedAnimationPopupShowing;
                 _selectedAnimation.SelectedIndexChanged += OnSelectedAnimationChanged;
-                _selectedAnimation.Parent = this;
 
                 var items = new List<string>(MaxAnimationsCount);
                 while (items.Count < MaxAnimationsCount)
                     items.Add(string.Empty);
                 _selectedAnimation.Items = items;
 
-                _animationPicker = new AssetPicker(new ScriptType(typeof(FlaxEngine.Animation)), new Vector2(_selectedAnimation.Left, _selectedAnimation.Bottom + 4));
+                _animationPicker = new AssetPicker(new ScriptType(typeof(FlaxEngine.Animation)), new Vector2(_selectedAnimation.Left, _selectedAnimation.Bottom + 4))
+                {
+                    Parent = this
+                };
                 _animationPicker.SelectedItemChanged += OnAnimationPickerItemChanged;
-                _animationPicker.Parent = this;
 
-                _animationSpeedLabel = new Label(_animationPicker.Left, _animationPicker.Bottom + 4, 40, TextBox.DefaultHeight);
-                _animationSpeedLabel.HorizontalAlignment = TextAlignment.Near;
-                _animationSpeedLabel.Text = "Speed:";
-                _animationSpeedLabel.Parent = this;
+                _animationSpeedLabel = new Label(_animationPicker.Left, _animationPicker.Bottom + 4, 40, TextBox.DefaultHeight)
+                {
+                    HorizontalAlignment = TextAlignment.Near,
+                    Text = "Speed:",
+                    Parent = this
+                };
 
-                _animationSpeed = new FloatValueBox(1.0f, _animationSpeedLabel.Right + 4, _animationSpeedLabel.Y, _selectedAnimation.Right - _animationSpeedLabel.Right - 4);
-                _animationSpeed.SlideSpeed = 0.01f;
+                _animationSpeed = new FloatValueBox(1.0f, _animationSpeedLabel.Right + 4, _animationSpeedLabel.Y, _selectedAnimation.Right - _animationSpeedLabel.Right - 4)
+                {
+                    SlideSpeed = 0.01f,
+                    Parent = this
+                };
                 _animationSpeed.ValueChanged += OnAnimationSpeedValueChanged;
-                _animationSpeed.Parent = this;
             }
 
             private void OnSelectedAnimationPopupShowing(ComboBox comboBox)
@@ -619,15 +630,19 @@ namespace FlaxEditor.Surface.Archetypes
             public MultiBlend1D(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch)
             : base(id, context, nodeArch, groupArch)
             {
-                _animationXLabel = new Label(_animationSpeedLabel.Left, _animationSpeedLabel.Bottom + 4, 40, TextBox.DefaultHeight);
-                _animationXLabel.HorizontalAlignment = TextAlignment.Near;
-                _animationXLabel.Text = "X:";
-                _animationXLabel.Parent = this;
+                _animationXLabel = new Label(_animationSpeedLabel.Left, _animationSpeedLabel.Bottom + 4, 40, TextBoxBase.DefaultHeight)
+                {
+                    HorizontalAlignment = TextAlignment.Near,
+                    Text = "X:",
+                    Parent = this
+                };
 
-                _animationX = new FloatValueBox(0.0f, _animationXLabel.Right + 4, _animationXLabel.Y, _selectedAnimation.Right - _animationXLabel.Right - 4);
-                _animationX.SlideSpeed = 0.01f;
+                _animationX = new FloatValueBox(0.0f, _animationXLabel.Right + 4, _animationXLabel.Y, _selectedAnimation.Right - _animationXLabel.Right - 4)
+                {
+                    SlideSpeed = 0.01f,
+                    Parent = this
+                };
                 _animationX.ValueChanged += OnAnimationXChanged;
-                _animationX.Parent = this;
 
                 _editor = new Editor(this,
                                      FlaxEditor.Surface.Constants.NodeMarginX,
@@ -745,25 +760,33 @@ namespace FlaxEditor.Surface.Archetypes
             public MultiBlend2D(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch)
             : base(id, context, nodeArch, groupArch)
             {
-                _animationXLabel = new Label(_animationSpeedLabel.Left, _animationSpeedLabel.Bottom + 4, 40, TextBox.DefaultHeight);
-                _animationXLabel.HorizontalAlignment = TextAlignment.Near;
-                _animationXLabel.Text = "X:";
-                _animationXLabel.Parent = this;
+                _animationXLabel = new Label(_animationSpeedLabel.Left, _animationSpeedLabel.Bottom + 4, 40, TextBox.DefaultHeight)
+                {
+                    HorizontalAlignment = TextAlignment.Near,
+                    Text = "X:",
+                    Parent = this
+                };
 
-                _animationX = new FloatValueBox(0.0f, _animationXLabel.Right + 4, _animationXLabel.Y, _selectedAnimation.Right - _animationXLabel.Right - 4);
-                _animationX.SlideSpeed = 0.01f;
+                _animationX = new FloatValueBox(0.0f, _animationXLabel.Right + 4, _animationXLabel.Y, _selectedAnimation.Right - _animationXLabel.Right - 4)
+                {
+                    SlideSpeed = 0.01f,
+                    Parent = this
+                };
                 _animationX.ValueChanged += OnAnimationXChanged;
-                _animationX.Parent = this;
 
-                _animationYLabel = new Label(_animationXLabel.Left, _animationXLabel.Bottom + 4, 40, TextBox.DefaultHeight);
-                _animationYLabel.HorizontalAlignment = TextAlignment.Near;
-                _animationYLabel.Text = "Y:";
-                _animationYLabel.Parent = this;
+                _animationYLabel = new Label(_animationXLabel.Left, _animationXLabel.Bottom + 4, 40, TextBox.DefaultHeight)
+                {
+                    HorizontalAlignment = TextAlignment.Near,
+                    Text = "Y:",
+                    Parent = this
+                };
 
-                _animationY = new FloatValueBox(0.0f, _animationYLabel.Right + 4, _animationYLabel.Y, _selectedAnimation.Right - _animationYLabel.Right - 4);
-                _animationY.SlideSpeed = 0.01f;
+                _animationY = new FloatValueBox(0.0f, _animationYLabel.Right + 4, _animationYLabel.Y, _selectedAnimation.Right - _animationYLabel.Right - 4)
+                {
+                    SlideSpeed = 0.01f,
+                    Parent = this
+                };
                 _animationY.ValueChanged += OnAnimationYChanged;
-                _animationY.Parent = this;
 
                 _editor = new Editor(this,
                                      FlaxEditor.Surface.Constants.NodeMarginX,
diff --git a/Source/Editor/Surface/Archetypes/Animation.StateMachine.cs b/Source/Editor/Surface/Archetypes/Animation.StateMachine.cs
index 2faa9feef..1d04ae187 100644
--- a/Source/Editor/Surface/Archetypes/Animation.StateMachine.cs
+++ b/Source/Editor/Surface/Archetypes/Animation.StateMachine.cs
@@ -81,9 +81,11 @@ namespace FlaxEditor.Surface.Archetypes
                 var marginX = FlaxEditor.Surface.Constants.NodeMarginX;
                 var uiStartPosY = FlaxEditor.Surface.Constants.NodeMarginY + FlaxEditor.Surface.Constants.NodeHeaderSize;
 
-                var editButton = new Button(marginX, uiStartPosY, 246, 20);
-                editButton.Text = "Edit";
-                editButton.Parent = this;
+                var editButton = new Button(marginX, uiStartPosY, 246, 20)
+                {
+                    Text = "Edit",
+                    Parent = this
+                };
                 editButton.Clicked += Edit;
 
                 var maxTransitionsPerUpdateLabel = new Label(marginX, editButton.Bottom + 4, 153, TextBox.DefaultHeight)
@@ -253,8 +255,7 @@ namespace FlaxEditor.Surface.Archetypes
             private void OnSurfaceLoaded(VisjectSurfaceContext context)
             {
                 // Ensure that loaded surface has entry node for state machine
-                var entryNode = context.FindNode(9, 19);
-                if (entryNode == null)
+                if (context.FindNode(9, 19) == null)
                 {
                     var wasEnabled = true;
                     if (Surface.Undo != null)
@@ -263,7 +264,7 @@ namespace FlaxEditor.Surface.Archetypes
                         Surface.Undo.Enabled = false;
                     }
 
-                    entryNode = context.SpawnNode(9, 19, new Vector2(100.0f));
+                    context.SpawnNode(9, 19, new Vector2(100.0f));
 
                     if (Surface.Undo != null)
                     {
@@ -545,9 +546,11 @@ namespace FlaxEditor.Surface.Archetypes
                 private void Add()
                 {
                     var context = _context.Get(_surface);
+
                     var src = context.FindNode(_srcStateId) as StateMachineState;
                     if (src == null)
                         throw new Exception("Missing source state.");
+
                     var dst = context.FindNode(_dstStateId) as StateMachineState;
                     if (dst == null)
                         throw new Exception("Missing destination state.");
@@ -565,12 +568,13 @@ namespace FlaxEditor.Surface.Archetypes
                 private void Remove()
                 {
                     var context = _context.Get(_surface);
-                    var src = context.FindNode(_srcStateId) as StateMachineState;
-                    if (src == null)
+
+                    if (!(context.FindNode(_srcStateId) is StateMachineState src))
                         throw new Exception("Missing source state.");
-                    var dst = context.FindNode(_dstStateId) as StateMachineState;
-                    if (dst == null)
+
+                    if (!(context.FindNode(_dstStateId) is StateMachineState dst))
                         throw new Exception("Missing destination state.");
+
                     var transition = src.Transitions.Find(x => x.DestinationState == dst);
                     if (transition == null)
                         throw new Exception("Missing transition.");
@@ -1308,8 +1312,7 @@ namespace FlaxEditor.Surface.Archetypes
             private void OnSurfaceLoaded(VisjectSurfaceContext context)
             {
                 // Ensure that loaded surface has output node for state
-                var entryNode = context.FindNode(9, 21);
-                if (entryNode == null)
+                if (context.FindNode(9, 21) == null)
                 {
                     var wasEnabled = true;
                     if (Surface.Undo != null)
@@ -1318,7 +1321,7 @@ namespace FlaxEditor.Surface.Archetypes
                         Surface.Undo.Enabled = false;
                     }
 
-                    entryNode = context.SpawnNode(9, 21, new Vector2(100.0f));
+                    context.SpawnNode(9, 21, new Vector2(100.0f));
 
                     if (Surface.Undo != null)
                     {
@@ -1676,8 +1679,7 @@ namespace FlaxEditor.Surface.Archetypes
             private void OnSurfaceLoaded(VisjectSurfaceContext context)
             {
                 // Ensure that loaded surface has rule output node
-                var ruleOutputNode = context.FindNode(9, 22);
-                if (ruleOutputNode == null)
+                if (context.FindNode(9, 22) == null)
                 {
                     var wasEnabled = true;
                     var undo = SourceState.Surface.Undo;
@@ -1687,7 +1689,7 @@ namespace FlaxEditor.Surface.Archetypes
                         undo.Enabled = false;
                     }
 
-                    ruleOutputNode = context.SpawnNode(9, 22, new Vector2(100.0f));
+                    context.SpawnNode(9, 22, new Vector2(100.0f));
 
                     // TODO: add default rule nodes for easier usage
 
diff --git a/Source/Editor/Surface/Archetypes/Constants.cs b/Source/Editor/Surface/Archetypes/Constants.cs
index 3ae9d6a8a..0b8defee0 100644
--- a/Source/Editor/Surface/Archetypes/Constants.cs
+++ b/Source/Editor/Surface/Archetypes/Constants.cs
@@ -393,7 +393,7 @@ namespace FlaxEditor.Surface.Archetypes
             int count = 0;
             if (ExtractNumber(ref filterText, out vec[count]))
             {
-                count = count + 1;
+                count++;
                 while (count < 4)
                 {
                     if (ExtractComma(ref filterText) && ExtractNumber(ref filterText, out vec[count]))
diff --git a/Source/Editor/Surface/Archetypes/Function.cs b/Source/Editor/Surface/Archetypes/Function.cs
index c5707d1dd..a47b41a82 100644
--- a/Source/Editor/Surface/Archetypes/Function.cs
+++ b/Source/Editor/Surface/Archetypes/Function.cs
@@ -766,9 +766,11 @@ namespace FlaxEditor.Surface.Archetypes
             private SignatureInfo LoadSignature()
             {
                 var signature = new SignatureInfo();
+
                 var data = Values[4] as byte[];
                 if (data == null || data.Length == 0)
                     return signature;
+
                 if (data[0] == 4)
                 {
                     using (var stream = new MemoryStream(data))
@@ -1449,8 +1451,11 @@ namespace FlaxEditor.Surface.Archetypes
 
             private void LoadSignature()
             {
-                _signature = new Signature();
-                _signature.Node = this;
+                _signature = new Signature
+                {
+                    Node = this
+                };
+
                 if (Values[0] is byte[] data && data.Length != 0)
                 {
                     using (var stream = new MemoryStream(data))
diff --git a/Source/Editor/Surface/Archetypes/Material.cs b/Source/Editor/Surface/Archetypes/Material.cs
index 4d65c760c..a89f62274 100644
--- a/Source/Editor/Surface/Archetypes/Material.cs
+++ b/Source/Editor/Surface/Archetypes/Material.cs
@@ -816,6 +816,40 @@ namespace FlaxEditor.Surface.Archetypes
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(Vector3), 1),
                 }
             },
+            new NodeArchetype
+            {
+                TypeID = 36,
+                Title = "HSVToRGB",
+                Description = "Converts a HSV value to linear RGB [X = 0/360, Y = 0/1, Z = 0/1]",
+                Flags = NodeFlags.MaterialGraph,
+                Size = new Vector2(160, 25),
+                DefaultValues = new object[]
+                {
+                    new Vector3(240, 1, 1),
+                },
+                Elements = new[]
+                {
+                    NodeElementArchetype.Factory.Input(0, "HSV", true, typeof(Vector3), 0, 0),
+                    NodeElementArchetype.Factory.Output(0, "RGB", typeof(Vector3), 1),
+                }
+            },
+            new NodeArchetype
+            {
+                TypeID = 37,
+                Title = "RGBToHSV",
+                Description = "Converts a linear RGB value to HSV [X = 0/360, Y = 0/1, Z = 0/1]",
+                Flags = NodeFlags.MaterialGraph,
+                Size = new Vector2(160, 25),
+                DefaultValues = new object[]
+                {
+                    new Vector3(0, 1, 0),
+                },
+                Elements = new[]
+                {
+                    NodeElementArchetype.Factory.Input(0, "RGB", true, typeof(Vector3), 0, 0),
+                    NodeElementArchetype.Factory.Output(0, "HSV", typeof(Vector3), 1),
+                }
+            }
         };
     }
 }
diff --git a/Source/Editor/Surface/ContextMenu/VisjectCM.cs b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
index f197ce98b..a0ad433cc 100644
--- a/Source/Editor/Surface/ContextMenu/VisjectCM.cs
+++ b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
@@ -171,16 +171,22 @@ namespace FlaxEditor.Surface.ContextMenu
                 // Check if can create group for them
                 if (nodes.Count > 0)
                 {
-                    var group = new VisjectCMGroup(this, groupArchetype);
-                    group.HeaderText = groupArchetype.Name;
+                    var group = new VisjectCMGroup(this, groupArchetype)
+                    {
+                        HeaderText = groupArchetype.Name
+                    };
+
                     group.Close(false);
                     for (int i = 0; i < nodes.Count; i++)
                     {
-                        var item = new VisjectCMItem(group, groupArchetype, nodes[i]);
-                        item.Parent = group;
+                        var item = new VisjectCMItem(group, groupArchetype, nodes[i])
+                        {
+                            Parent = group
+                        };
                     }
                     group.SortChildren();
                     group.Parent = panel2;
+
                     _groups.Add(group);
                 }
             }
@@ -209,16 +215,21 @@ namespace FlaxEditor.Surface.ContextMenu
                     // Create new group if name is unique
                     if (group == null)
                     {
-                        group = new VisjectCMGroup(this, info.CustomNodesGroup);
-                        group.HeaderText = groupName;
+                        group = new VisjectCMGroup(this, info.CustomNodesGroup)
+                        {
+                            HeaderText = groupName
+                        };
+
                         group.Close(false);
                         group.Parent = _groupsPanel;
                         _groups.Add(group);
                     }
 
                     // Add new item
-                    var item = new VisjectCMItem(group, info.CustomNodesGroup, nodeArchetype);
-                    item.Parent = group;
+                    var item = new VisjectCMItem(group, info.CustomNodesGroup, nodeArchetype)
+                    {
+                        Parent = group
+                    };
 
                     // Order items
                     group.SortChildren();
@@ -237,16 +248,23 @@ namespace FlaxEditor.Surface.ContextMenu
             {
                 Profiler.BeginEvent("VisjectCM.AddGroup");
 
-                var group = new VisjectCMGroup(this, groupArchetype);
-                group.HeaderText = groupArchetype.Name;
+                var group = new VisjectCMGroup(this, groupArchetype)
+                {
+                    HeaderText = groupArchetype.Name
+                };
+
                 group.Close(false);
+
                 foreach (var nodeArchetype in groupArchetype.Archetypes)
                 {
-                    var item = new VisjectCMItem(group, groupArchetype, nodeArchetype);
-                    item.Parent = group;
+                    var item = new VisjectCMItem(group, groupArchetype, nodeArchetype)
+                    {
+                        Parent = group
+                    };
                 }
                 group.SortChildren();
                 group.Parent = _groupsPanel;
+
                 _groups.Add(group);
 
                 if (!IsLayoutLocked)
@@ -281,17 +299,24 @@ namespace FlaxEditor.Surface.ContextMenu
                 var groups = new List<VisjectCMGroup>();
                 foreach (var groupArchetype in groupArchetypes)
                 {
-                    var group = new VisjectCMGroup(this, groupArchetype);
-                    group.HeaderText = groupArchetype.Name;
+                    var group = new VisjectCMGroup(this, groupArchetype)
+                    {
+                        HeaderText = groupArchetype.Name
+                    };
+
                     group.Close(false);
+
                     foreach (var nodeArchetype in groupArchetype.Archetypes)
                     {
-                        var item = new VisjectCMItem(group, groupArchetype, nodeArchetype);
-                        item.Parent = group;
+                        var item = new VisjectCMItem(group, groupArchetype, nodeArchetype)
+                        {
+                            Parent = group
+                        };
                     }
                     group.SortChildren();
                     group.Parent = _groupsPanel;
                     _groups.Add(group);
+
                     groups.Add(group);
                 }
                 Profiler.EndEvent();
@@ -497,8 +522,11 @@ namespace FlaxEditor.Surface.ContextMenu
                     Archetypes = archetypes
                 };
 
-                var group = new VisjectCMGroup(this, groupArchetype);
-                group.HeaderText = groupArchetype.Name;
+                var group = new VisjectCMGroup(this, groupArchetype)
+                {
+                    HeaderText = groupArchetype.Name
+                };
+
                 group.Close(false);
                 archetypeIndex = 0;
                 for (int i = 0; i < parameters.Count; i++)
@@ -507,13 +535,17 @@ namespace FlaxEditor.Surface.ContextMenu
                     if (!param.IsPublic)
                         continue;
 
-                    var item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++]);
-                    item.Parent = group;
+                    var item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++])
+                    {
+                        Parent = group
+                    };
 
                     if (_parameterSetNodeArchetype != null)
                     {
-                        item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++]);
-                        item.Parent = group;
+                        item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++])
+                        {
+                            Parent = group
+                        };
                     }
                 }
                 group.SortChildren();
diff --git a/Source/Editor/Surface/Elements/Box.cs b/Source/Editor/Surface/Elements/Box.cs
index b8d88741f..2a460013c 100644
--- a/Source/Editor/Surface/Elements/Box.cs
+++ b/Source/Editor/Surface/Elements/Box.cs
@@ -305,8 +305,11 @@ namespace FlaxEditor.Surface.Elements
             if (HasAnyConnection)
             {
                 // Remove all connections
-                var toUpdate = new List<Box>(1 + Connections.Count);
-                toUpdate.Add(this);
+                var toUpdate = new List<Box>(1 + Connections.Count)
+                {
+                    this
+                };
+
                 for (int i = 0; i < Connections.Count; i++)
                 {
                     var targetBox = Connections[i];
diff --git a/Source/Editor/Surface/SurfaceMeta.cs b/Source/Editor/Surface/SurfaceMeta.cs
index 4cd8405e4..c69981461 100644
--- a/Source/Editor/Surface/SurfaceMeta.cs
+++ b/Source/Editor/Surface/SurfaceMeta.cs
@@ -146,9 +146,10 @@ namespace FlaxEditor.Surface
 
                 for (int i = 0; i < entries; i++)
                 {
-                    Entry e = new Entry();
-
-                    e.TypeID = stream.ReadInt32();
+                    Entry e = new Entry
+                    {
+                        TypeID = stream.ReadInt32()
+                    };
                     stream.ReadInt64(); // don't use CreationTime
 
                     uint dataSize = stream.ReadUInt32();
diff --git a/Source/Editor/Surface/SurfaceNode.cs b/Source/Editor/Surface/SurfaceNode.cs
index bdce94513..9ace32695 100644
--- a/Source/Editor/Surface/SurfaceNode.cs
+++ b/Source/Editor/Surface/SurfaceNode.cs
@@ -156,7 +156,6 @@ namespace FlaxEditor.Surface
         /// <param name="height">The height.</param>
         protected void Resize(float width, float height)
         {
-            var prevSize = Size;
             Size = CalculateNodeSize(width, height);
 
             // Update boxes on width change
@@ -794,7 +793,7 @@ namespace FlaxEditor.Surface
         /// <inheritdoc />
         public override bool OnShowTooltip(out string text, out Vector2 location, out Rectangle area)
         {
-            var result = base.OnShowTooltip(out text, out location, out area);
+            var result = base.OnShowTooltip(out text, out _, out area);
 
             // Change the position
             location = new Vector2(_headerRect.Width * 0.5f, _headerRect.Bottom);
diff --git a/Source/Editor/Surface/SurfaceRootControl.cs b/Source/Editor/Surface/SurfaceRootControl.cs
index e068f0a29..92db6e098 100644
--- a/Source/Editor/Surface/SurfaceRootControl.cs
+++ b/Source/Editor/Surface/SurfaceRootControl.cs
@@ -37,8 +37,7 @@ namespace FlaxEditor.Surface
             // Push clipping mask
             if (ClipChildren)
             {
-                Rectangle clientArea;
-                GetDesireClientArea(out clientArea);
+                GetDesireClientArea(out Rectangle clientArea);
                 Render2D.PushClip(ref clientArea);
             }
 
diff --git a/Source/Editor/Surface/Undo/ConnectBoxesAction.cs b/Source/Editor/Surface/Undo/ConnectBoxesAction.cs
index 6627364ed..c200f147d 100644
--- a/Source/Editor/Surface/Undo/ConnectBoxesAction.cs
+++ b/Source/Editor/Surface/Undo/ConnectBoxesAction.cs
@@ -76,9 +76,11 @@ namespace FlaxEditor.Surface.Undo
             var iB = _input.Get(context);
             var oB = _output.Get(context);
 
-            var toUpdate = new HashSet<Box>();
-            toUpdate.Add(iB);
-            toUpdate.Add(oB);
+            var toUpdate = new HashSet<Box>
+            {
+                iB,
+                oB
+            };
             toUpdate.AddRange(iB.Connections);
             toUpdate.AddRange(oB.Connections);
 
diff --git a/Source/Editor/Surface/VisjectSurface.Context.cs b/Source/Editor/Surface/VisjectSurface.Context.cs
index c44234e8a..81b62b195 100644
--- a/Source/Editor/Surface/VisjectSurface.Context.cs
+++ b/Source/Editor/Surface/VisjectSurface.Context.cs
@@ -54,8 +54,7 @@ namespace FlaxEditor.Surface
                 return;
 
             // Get or create context
-            VisjectSurfaceContext surfaceContext;
-            if (!_contextCache.TryGetValue(context, out surfaceContext))
+            if (!_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext))
             {
                 surfaceContext = CreateContext(_context, context);
                 _context?.Children.Add(surfaceContext);
@@ -119,8 +118,7 @@ namespace FlaxEditor.Surface
             }
 
             // Check if has context in cache
-            VisjectSurfaceContext surfaceContext;
-            if (_contextCache.TryGetValue(context, out surfaceContext))
+            if (_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext))
             {
                 // Remove from navigation path
                 while (ContextStack.Contains(surfaceContext))
@@ -149,8 +147,7 @@ namespace FlaxEditor.Surface
                 return;
 
             // Check if already in a path
-            VisjectSurfaceContext surfaceContext;
-            if (_contextCache.TryGetValue(context, out surfaceContext) && ContextStack.Contains(surfaceContext))
+            if (_contextCache.TryGetValue(context, out VisjectSurfaceContext surfaceContext) && ContextStack.Contains(surfaceContext))
             {
                 // Change stack
                 do
diff --git a/Source/Editor/Surface/VisjectSurface.cs b/Source/Editor/Surface/VisjectSurface.cs
index d98e2c421..33786c935 100644
--- a/Source/Editor/Surface/VisjectSurface.cs
+++ b/Source/Editor/Surface/VisjectSurface.cs
@@ -743,6 +743,7 @@ namespace FlaxEditor.Surface
         {
             if (!CanEdit)
                 return;
+
             var node = control as SurfaceNode;
             if (node == null)
             {
@@ -750,6 +751,7 @@ namespace FlaxEditor.Surface
                 MarkAsEdited();
                 return;
             }
+
             if ((node.Archetype.Flags & NodeFlags.NoRemove) != 0)
                 return;
 
diff --git a/Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs b/Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs
index 556d4a6dc..ad524287b 100644
--- a/Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs
+++ b/Source/Editor/Surface/VisjectSurfaceContext.Serialization.cs
@@ -577,7 +577,7 @@ namespace FlaxEditor.Surface
                         // Store node typename in values container
                         node.Values[0] = typeName;
                     }
-                    if (node is MissingNode missingNode)
+                    if (node is MissingNode)
                     {
                         // Read all values
                         Array.Resize(ref node.Values, valuesCnt);
@@ -623,7 +623,7 @@ namespace FlaxEditor.Surface
                     for (int j = 0; j < boxesCount; j++)
                     {
                         var id = stream.ReadByte();
-                        uint type = stream.ReadUInt32();
+                        stream.ReadUInt32(); // Skip type
                         ushort connectionsCnt = stream.ReadUInt16();
 
                         ConnectionHint hint;
@@ -749,7 +749,7 @@ namespace FlaxEditor.Surface
                         // Store node typename in values container
                         node.Values[0] = typeName;
                     }
-                    if (node is MissingNode missingNode)
+                    if (node is MissingNode)
                     {
                         // Read all values
                         Array.Resize(ref node.Values, valuesCnt);
@@ -769,7 +769,7 @@ namespace FlaxEditor.Surface
                     {
                         Editor.LogWarning(string.Format("Invalid node values. Loaded: {0}, expected: {1}. Type: {2}, {3}", valuesCnt, nodeValuesCnt, node.Archetype.Title, node.Archetype.TypeID));
 
-                        object dummy = null;
+                        object dummy;
                         for (int j = firstValueReadIdx; j < valuesCnt; j++)
                         {
                             dummy = stream.ReadVariant();
@@ -789,7 +789,7 @@ namespace FlaxEditor.Surface
                     for (int j = 0; j < boxesCount; j++)
                     {
                         var id = stream.ReadByte();
-                        var type = stream.ReadVariantType();
+                        stream.ReadVariantType(); // Skip type
                         var connectionsCnt = stream.ReadUInt16();
 
                         ConnectionHint hint;
diff --git a/Source/Editor/Surface/VisjectSurfaceWindow.cs b/Source/Editor/Surface/VisjectSurfaceWindow.cs
index 38415565a..b5c502ba5 100644
--- a/Source/Editor/Surface/VisjectSurfaceWindow.cs
+++ b/Source/Editor/Surface/VisjectSurfaceWindow.cs
@@ -980,10 +980,10 @@ namespace FlaxEditor.Surface
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
 
-            if (float.TryParse(node.GetAttribute("Split1"), out value1))
+            if (float.TryParse(node.GetAttribute("Split1"), out float value1))
                 _split1.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Split2"), out value1))
                 _split2.SplitterValue = value1;
         }
diff --git a/Source/Editor/Tools/Foliage/EditFoliageSelectionOutline.cs b/Source/Editor/Tools/Foliage/EditFoliageSelectionOutline.cs
index b79a4847a..0a3db1842 100644
--- a/Source/Editor/Tools/Foliage/EditFoliageSelectionOutline.cs
+++ b/Source/Editor/Tools/Foliage/EditFoliageSelectionOutline.cs
@@ -56,8 +56,10 @@ namespace FlaxEditor.Tools.Foliage
 
                 if (!_staticModel)
                 {
-                    _staticModel = new StaticModel();
-                    _staticModel.StaticFlags = StaticFlags.None;
+                    _staticModel = new StaticModel
+                    {
+                        StaticFlags = StaticFlags.None
+                    };
                 }
 
                 _staticModel.Model = model;
diff --git a/Source/Editor/Tools/Foliage/FoliageTab.cs b/Source/Editor/Tools/Foliage/FoliageTab.cs
index faf71bf1f..ccd536823 100644
--- a/Source/Editor/Tools/Foliage/FoliageTab.cs
+++ b/Source/Editor/Tools/Foliage/FoliageTab.cs
@@ -179,9 +179,11 @@ namespace FlaxEditor.Tools.Foliage
         private void OnCreateNewFoliageClicked()
         {
             // Create
-            var actor = new FlaxEngine.Foliage();
-            actor.StaticFlags = StaticFlags.FullyStatic;
-            actor.Name = "Foliage";
+            var actor = new FlaxEngine.Foliage
+            {
+                StaticFlags = StaticFlags.FullyStatic,
+                Name = "Foliage"
+            };
 
             // Spawn and select
             Editor.SceneEditing.Spawn(actor);
diff --git a/Source/Editor/Tools/Foliage/PaintTab.cs b/Source/Editor/Tools/Foliage/PaintTab.cs
index b6dc6094b..a0555f7e2 100644
--- a/Source/Editor/Tools/Foliage/PaintTab.cs
+++ b/Source/Editor/Tools/Foliage/PaintTab.cs
@@ -282,8 +282,7 @@ namespace FlaxEditor.Tools.Foliage
                     };
 
                     // Try restore painting with the given model ID
-                    bool itemChecked;
-                    if (!Tab.FoliageTypeModelIdsToPaint.TryGetValue(model.ID, out itemChecked))
+                    if (!Tab.FoliageTypeModelIdsToPaint.TryGetValue(model.ID, out bool itemChecked))
                     {
                         // Enable by default
                         itemChecked = true;
diff --git a/Source/Editor/Tools/Terrain/CreateTerrainDialog.cs b/Source/Editor/Tools/Terrain/CreateTerrainDialog.cs
index 1834c20d3..fe62b474a 100644
--- a/Source/Editor/Tools/Terrain/CreateTerrainDialog.cs
+++ b/Source/Editor/Tools/Terrain/CreateTerrainDialog.cs
@@ -179,8 +179,10 @@ namespace FlaxEditor.Tools.Terrain
 
             // Start async work
             _terrain = terrain;
-            var thread = new System.Threading.Thread(Generate);
-            thread.Name = "Terrain Generator";
+            var thread = new System.Threading.Thread(Generate)
+            {
+                Name = "Terrain Generator"
+            };
             thread.Start();
         }
 
diff --git a/Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs b/Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs
index f41c5303d..3a5bf09f4 100644
--- a/Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs
+++ b/Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs
@@ -310,10 +310,9 @@ namespace FlaxEditor.Tools.Terrain
                 throw new InvalidOperationException("Cannot set cursor then no terrain is selected.");
             var brushBounds = CursorBrushBounds;
             var patchesCount = terrain.PatchesCount;
-            BoundingBox tmp;
             for (int patchIndex = 0; patchIndex < patchesCount; patchIndex++)
             {
-                terrain.GetPatchBounds(patchIndex, out tmp);
+                terrain.GetPatchBounds(patchIndex, out BoundingBox tmp);
                 if (!tmp.Intersects(ref brushBounds))
                     continue;
 
diff --git a/Source/Editor/Tools/Terrain/SculptTerrainGizmoMode.cs b/Source/Editor/Tools/Terrain/SculptTerrainGizmoMode.cs
index 82ba9c905..0ec0c5130 100644
--- a/Source/Editor/Tools/Terrain/SculptTerrainGizmoMode.cs
+++ b/Source/Editor/Tools/Terrain/SculptTerrainGizmoMode.cs
@@ -329,10 +329,9 @@ namespace FlaxEditor.Tools.Terrain
                 throw new InvalidOperationException("Cannot set cursor then no terrain is selected.");
             var brushBounds = CursorBrushBounds;
             var patchesCount = terrain.PatchesCount;
-            BoundingBox tmp;
             for (int patchIndex = 0; patchIndex < patchesCount; patchIndex++)
             {
-                terrain.GetPatchBounds(patchIndex, out tmp);
+                terrain.GetPatchBounds(patchIndex, out BoundingBox tmp);
                 if (!tmp.Intersects(ref brushBounds))
                     continue;
 
diff --git a/Source/Editor/Utilities/Utils.cs b/Source/Editor/Utilities/Utils.cs
index 95ad9ade5..a13d441d9 100644
--- a/Source/Editor/Utilities/Utils.cs
+++ b/Source/Editor/Utilities/Utils.cs
@@ -85,7 +85,7 @@ namespace FlaxEditor.Utilities
             while (bytes >= 1024 && order < MemorySizePostfixes.Length - 1)
             {
                 order++;
-                bytes = bytes / 1024;
+                bytes /= 1024;
             }
 
             return string.Format("{0:0.##} {1}", bytes, MemorySizePostfixes[order]);
@@ -102,7 +102,7 @@ namespace FlaxEditor.Utilities
             while (bytes >= 1024 && order < MemorySizePostfixes.Length - 1)
             {
                 order++;
-                bytes = bytes / 1024;
+                bytes /= 1024;
             }
 
             return string.Format("{0:0.##} {1}", bytes, MemorySizePostfixes[order]);
@@ -1694,8 +1694,7 @@ namespace FlaxEditor.Utilities
                 orientation = Quaternion.LookRotation(dir, Vector3.Cross(Vector3.Cross(dir, Vector3.Up), dir));
             Vector3 up = Vector3.Up * orientation;
             box.Transformation = Matrix.CreateWorld(min + vec * 0.5f, dir, up);
-            Matrix inv;
-            Matrix.Invert(ref box.Transformation, out inv);
+            Matrix.Invert(ref box.Transformation, out Matrix inv);
             Vector3 vecLocal = Vector3.TransformNormal(vec * 0.5f, inv);
             box.Extents.X = margin;
             box.Extents.Y = margin;
diff --git a/Source/Editor/Viewport/Cameras/ArcBallCamera.cs b/Source/Editor/Viewport/Cameras/ArcBallCamera.cs
index 9e0fd4859..876adc796 100644
--- a/Source/Editor/Viewport/Cameras/ArcBallCamera.cs
+++ b/Source/Editor/Viewport/Cameras/ArcBallCamera.cs
@@ -99,8 +99,7 @@ namespace FlaxEditor.Viewport.Cameras
         {
             centerMouse = true;
 
-            EditorViewport.Input input;
-            Viewport.GetInput(out input);
+            Viewport.GetInput(out EditorViewport.Input input);
 
             // Rotate
             Viewport.YawPitch += mouseDelta;
diff --git a/Source/Editor/Viewport/Cameras/FPSCamera.cs b/Source/Editor/Viewport/Cameras/FPSCamera.cs
index b5098696d..6d0376a89 100644
--- a/Source/Editor/Viewport/Cameras/FPSCamera.cs
+++ b/Source/Editor/Viewport/Cameras/FPSCamera.cs
@@ -85,8 +85,7 @@ namespace FlaxEditor.Viewport.Cameras
         /// <param name="actor">The actor to preview.</param>
         public void ShowActor(Actor actor)
         {
-            BoundingSphere sphere;
-            Editor.GetActorEditorSphere(actor, out sphere);
+            Editor.GetActorEditorSphere(actor, out BoundingSphere sphere);
             ShowSphere(ref sphere);
         }
 
@@ -104,8 +103,7 @@ namespace FlaxEditor.Viewport.Cameras
             {
                 if (actors[i] is ActorNode actor)
                 {
-                    BoundingSphere sphere;
-                    Editor.GetActorEditorSphere(actor.Actor, out sphere);
+                    Editor.GetActorEditorSphere(actor.Actor, out BoundingSphere sphere);
                     BoundingSphere.Merge(ref mergesSphere, ref sphere, out mergesSphere);
                 }
             }
@@ -163,7 +161,7 @@ namespace FlaxEditor.Viewport.Cameras
             Viewport.GetInput(out var input);
             Viewport.GetPrevInput(out var prevInput);
             var mainViewport = Viewport as MainEditorGizmoViewport;
-            bool isUsingGizmo = mainViewport != null && mainViewport.TransformGizmo.ActiveAxis != TransformGizmo.Axis.None;
+            bool isUsingGizmo = mainViewport != null && mainViewport.TransformGizmo.ActiveAxis != TransformGizmoBase.Axis.None;
 
             // Get current view properties
             float yaw = Viewport.Yaw;
@@ -179,8 +177,7 @@ namespace FlaxEditor.Viewport.Cameras
             // Dolly
             if (input.IsPanning || input.IsMoving || input.IsRotating)
             {
-                Vector3 move;
-                Vector3.Transform(ref moveDelta, ref rotation, out move);
+                Vector3.Transform(ref moveDelta, ref rotation, out Vector3 move);
                 position += move;
             }
 
diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index a19589c05..00da69343 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -453,9 +453,11 @@ namespace FlaxEditor.Viewport
                 // Camera speed widget
                 var camSpeed = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
                 var camSpeedCM = new ContextMenu();
-                var camSpeedButton = new ViewportWidgetButton(_movementSpeed.ToString(), Editor.Instance.Icons.ArrowRightBorder16, camSpeedCM);
-                camSpeedButton.Tag = this;
-                camSpeedButton.TooltipText = "Camera speed scale";
+                var camSpeedButton = new ViewportWidgetButton(_movementSpeed.ToString(), Editor.Instance.Icons.ArrowRightBorder16, camSpeedCM)
+                {
+                    Tag = this,
+                    TooltipText = "Camera speed scale"
+                };
                 _speedWidget = camSpeedButton;
                 for (int i = 0; i < EditorViewportCameraSpeedValues.Length; i++)
                 {
@@ -471,9 +473,11 @@ namespace FlaxEditor.Viewport
                 // View mode widget
                 var viewMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperLeft);
                 ViewWidgetButtonMenu = new ContextMenu();
-                var viewModeButton = new ViewportWidgetButton("View", SpriteHandle.Invalid, ViewWidgetButtonMenu);
-                viewModeButton.TooltipText = "View properties";
-                viewModeButton.Parent = viewMode;
+                var viewModeButton = new ViewportWidgetButton("View", SpriteHandle.Invalid, ViewWidgetButtonMenu)
+                {
+                    TooltipText = "View properties",
+                    Parent = viewMode
+                };
                 viewMode.Parent = this;
 
                 // Show
@@ -524,8 +528,10 @@ namespace FlaxEditor.Viewport
                 // Orthographic
                 {
                     var ortho = ViewWidgetButtonMenu.AddButton("Orthographic");
-                    var orthoValue = new CheckBox(90, 2, _isOrtho);
-                    orthoValue.Parent = ortho;
+                    var orthoValue = new CheckBox(90, 2, _isOrtho)
+                    {
+                        Parent = ortho
+                    };
                     orthoValue.StateChanged += checkBox =>
                     {
                         if (checkBox.Checked != _isOrtho)
@@ -552,8 +558,11 @@ namespace FlaxEditor.Viewport
                 // Field of View
                 {
                     var fov = ViewWidgetButtonMenu.AddButton("Field Of View");
-                    var fovValue = new FloatValueBox(1, 90, 2, 70.0f, 35.0f, 160.0f, 0.1f);
-                    fovValue.Parent = fov;
+                    var fovValue = new FloatValueBox(1, 90, 2, 70.0f, 35.0f, 160.0f, 0.1f)
+                    {
+                        Parent = fov
+                    };
+
                     fovValue.ValueChanged += () => _fieldOfView = fovValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control =>
                     {
@@ -565,8 +574,11 @@ namespace FlaxEditor.Viewport
                 // Ortho Scale
                 {
                     var orthoSize = ViewWidgetButtonMenu.AddButton("Ortho Scale");
-                    var orthoSizeValue = new FloatValueBox(_orthoSize, 90, 2, 70.0f, 0.001f, 100000.0f, 0.01f);
-                    orthoSizeValue.Parent = orthoSize;
+                    var orthoSizeValue = new FloatValueBox(_orthoSize, 90, 2, 70.0f, 0.001f, 100000.0f, 0.01f)
+                    {
+                        Parent = orthoSize
+                    };
+
                     orthoSizeValue.ValueChanged += () => _orthoSize = orthoSizeValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control =>
                     {
@@ -578,8 +590,10 @@ namespace FlaxEditor.Viewport
                 // Near Plane
                 {
                     var nearPlane = ViewWidgetButtonMenu.AddButton("Near Plane");
-                    var nearPlaneValue = new FloatValueBox(2.0f, 90, 2, 70.0f, 0.001f, 1000.0f);
-                    nearPlaneValue.Parent = nearPlane;
+                    var nearPlaneValue = new FloatValueBox(2.0f, 90, 2, 70.0f, 0.001f, 1000.0f)
+                    {
+                        Parent = nearPlane
+                    };
                     nearPlaneValue.ValueChanged += () => _nearPlane = nearPlaneValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => nearPlaneValue.Value = _nearPlane;
                 }
@@ -587,8 +601,10 @@ namespace FlaxEditor.Viewport
                 // Far Plane
                 {
                     var farPlane = ViewWidgetButtonMenu.AddButton("Far Plane");
-                    var farPlaneValue = new FloatValueBox(1000, 90, 2, 70.0f, 10.0f);
-                    farPlaneValue.Parent = farPlane;
+                    var farPlaneValue = new FloatValueBox(1000, 90, 2, 70.0f, 10.0f)
+                    {
+                        Parent = farPlane
+                    };
                     farPlaneValue.ValueChanged += () => _farPlane = farPlaneValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => farPlaneValue.Value = _farPlane;
                 }
@@ -596,8 +612,10 @@ namespace FlaxEditor.Viewport
                 // Brightness
                 {
                     var brightness = ViewWidgetButtonMenu.AddButton("Brightness");
-                    var brightnessValue = new FloatValueBox(1.0f, 90, 2, 70.0f, 0.001f, 10.0f, 0.001f);
-                    brightnessValue.Parent = brightness;
+                    var brightnessValue = new FloatValueBox(1.0f, 90, 2, 70.0f, 0.001f, 10.0f, 0.001f)
+                    {
+                        Parent = brightness
+                    };
                     brightnessValue.ValueChanged += () => Brightness = brightnessValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => brightnessValue.Value = Brightness;
                 }
@@ -605,8 +623,10 @@ namespace FlaxEditor.Viewport
                 // Resolution
                 {
                     var resolution = ViewWidgetButtonMenu.AddButton("Resolution");
-                    var resolutionValue = new FloatValueBox(1.0f, 90, 2, 70.0f, 0.1f, 4.0f, 0.001f);
-                    resolutionValue.Parent = resolution;
+                    var resolutionValue = new FloatValueBox(1.0f, 90, 2, 70.0f, 0.1f, 4.0f, 0.001f)
+                    {
+                        Parent = resolution
+                    };
                     resolutionValue.ValueChanged += () => ResolutionScale = resolutionValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => resolutionValue.Value = ResolutionScale;
                 }
@@ -614,8 +634,11 @@ namespace FlaxEditor.Viewport
                 // Invert Panning
                 {
                     var invert = ViewWidgetButtonMenu.AddButton("Invert Panning");
-                    var invertValue = new CheckBox(90, 2, _invertPanning);
-                    invertValue.Parent = invert;
+                    var invertValue = new CheckBox(90, 2, _invertPanning)
+                    {
+                        Parent = invert
+                    };
+
                     invertValue.StateChanged += checkBox =>
                     {
                         if (checkBox.Checked != _invertPanning)
@@ -690,10 +713,12 @@ namespace FlaxEditor.Viewport
 
         private void InitFpsCounter()
         {
-            _fpsCounter = new FpsCounter(10, ViewportWidgetsContainer.WidgetsHeight + 14);
-            _fpsCounter.Visible = false;
-            _fpsCounter.Enabled = false;
-            _fpsCounter.Parent = this;
+            _fpsCounter = new FpsCounter(10, ViewportWidgetsContainer.WidgetsHeight + 14)
+            {
+                Visible = false,
+                Enabled = false,
+                Parent = this
+            };
         }
 
         #endregion
@@ -1085,7 +1110,7 @@ namespace FlaxEditor.Viewport
                 {
                     // Accelerate the delta
                     var currentDelta = mouseDelta;
-                    mouseDelta = mouseDelta + _mouseDeltaRightLast * _mouseAccelerationScale;
+                    mouseDelta += _mouseDeltaRightLast * _mouseAccelerationScale;
                     _mouseDeltaRightLast = currentDelta;
                 }
 
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 7906cc6e5..fc6a50a34 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -228,9 +228,13 @@ namespace FlaxEditor.Viewport
                 Parent = scaleSnappingWidget
             };
             enableScaleSnapping.Toggled += OnScaleSnappingToggle;
+
             var scaleSnappingCM = new ContextMenu();
-            _scaleSnapping = new ViewportWidgetButton(TransformGizmo.ScaleSnapValue.ToString(), SpriteHandle.Invalid, scaleSnappingCM);
-            _scaleSnapping.TooltipText = "Scale snapping values";
+            _scaleSnapping = new ViewportWidgetButton(TransformGizmo.ScaleSnapValue.ToString(), SpriteHandle.Invalid, scaleSnappingCM)
+            {
+                TooltipText = "Scale snapping values"
+            };
+
             for (int i = 0; i < EditorViewportScaleSnapValues.Length; i++)
             {
                 var v = EditorViewportScaleSnapValues[i];
@@ -251,9 +255,13 @@ namespace FlaxEditor.Viewport
                 Parent = rotateSnappingWidget
             };
             enableRotateSnapping.Toggled += OnRotateSnappingToggle;
+
             var rotateSnappingCM = new ContextMenu();
-            _rotateSnapping = new ViewportWidgetButton(TransformGizmo.RotationSnapValue.ToString(), SpriteHandle.Invalid, rotateSnappingCM);
-            _rotateSnapping.TooltipText = "Rotation snapping values";
+            _rotateSnapping = new ViewportWidgetButton(TransformGizmo.RotationSnapValue.ToString(), SpriteHandle.Invalid, rotateSnappingCM)
+            {
+                TooltipText = "Rotation snapping values"
+            };
+
             for (int i = 0; i < EditorViewportRotateSnapValues.Length; i++)
             {
                 var v = EditorViewportRotateSnapValues[i];
@@ -274,9 +282,13 @@ namespace FlaxEditor.Viewport
                 Parent = translateSnappingWidget
             };
             enableTranslateSnapping.Toggled += OnTranslateSnappingToggle;
+
             var translateSnappingCM = new ContextMenu();
-            _translateSnapping = new ViewportWidgetButton(TransformGizmo.TranslationSnapValue.ToString(), SpriteHandle.Invalid, translateSnappingCM);
-            _translateSnapping.TooltipText = "Position snapping values";
+            _translateSnapping = new ViewportWidgetButton(TransformGizmo.TranslationSnapValue.ToString(), SpriteHandle.Invalid, translateSnappingCM)
+            {
+                TooltipText = "Position snapping values"
+            };
+
             for (int i = 0; i < EditorViewportTranslateSnapValues.Length; i++)
             {
                 var v = EditorViewportTranslateSnapValues[i];
@@ -368,15 +380,17 @@ namespace FlaxEditor.Viewport
                 return;
 
             // Create actor
-            var actor = new Camera();
-            actor.StaticFlags = StaticFlags.None;
-            actor.Name = "Camera";
-            actor.Transform = ViewTransform;
-            actor.NearPlane = NearPlane;
-            actor.FarPlane = FarPlane;
-            actor.OrthographicScale = OrthographicScale;
-            actor.UsePerspective = !UseOrthographicProjection;
-            actor.FieldOfView = FieldOfView;
+            var actor = new Camera
+            {
+                StaticFlags = StaticFlags.None,
+                Name = "Camera",
+                Transform = ViewTransform,
+                NearPlane = NearPlane,
+                FarPlane = FarPlane,
+                OrthographicScale = OrthographicScale,
+                UsePerspective = !UseOrthographicProjection,
+                FieldOfView = FieldOfView
+            };
 
             // Spawn
             Editor.Instance.SceneEditing.Spawn(actor);
@@ -819,8 +833,7 @@ namespace FlaxEditor.Viewport
 
         private Vector3 PostProcessSpawnedActorLocation(Actor actor, ref Vector3 hitLocation)
         {
-            BoundingBox box;
-            Editor.GetActorEditorBox(actor, out box);
+            Editor.GetActorEditorBox(actor, out _);
 
             // Place the object
             //var location = hitLocation - (box.Size.Length * 0.5f) * ViewDirection;
@@ -846,9 +859,11 @@ namespace FlaxEditor.Viewport
                 if (assetItem.IsOfType<ParticleSystem>())
                 {
                     var asset = FlaxEngine.Content.LoadAsync<ParticleSystem>(item.ID);
-                    var actor = new ParticleEffect();
-                    actor.Name = item.ShortName;
-                    actor.ParticleSystem = asset;
+                    var actor = new ParticleEffect
+                    {
+                        Name = item.ShortName,
+                        ParticleSystem = asset
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Editor.Instance.SceneEditing.Spawn(actor);
                     return;
@@ -856,9 +871,11 @@ namespace FlaxEditor.Viewport
                 if (assetItem.IsOfType<SceneAnimation>())
                 {
                     var asset = FlaxEngine.Content.LoadAsync<SceneAnimation>(item.ID);
-                    var actor = new SceneAnimationPlayer();
-                    actor.Name = item.ShortName;
-                    actor.Animation = asset;
+                    var actor = new SceneAnimationPlayer
+                    {
+                        Name = item.ShortName,
+                        Animation = asset
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Editor.Instance.SceneEditing.Spawn(actor);
                     return;
@@ -891,9 +908,11 @@ namespace FlaxEditor.Viewport
                 if (assetItem.IsOfType<SkinnedModel>())
                 {
                     var model = FlaxEngine.Content.LoadAsync<SkinnedModel>(item.ID);
-                    var actor = new AnimatedModel();
-                    actor.Name = item.ShortName;
-                    actor.SkinnedModel = model;
+                    var actor = new AnimatedModel
+                    {
+                        Name = item.ShortName,
+                        SkinnedModel = model
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Editor.Instance.SceneEditing.Spawn(actor);
                     return;
@@ -901,9 +920,11 @@ namespace FlaxEditor.Viewport
                 if (assetItem.IsOfType<Model>())
                 {
                     var model = FlaxEngine.Content.LoadAsync<Model>(item.ID);
-                    var actor = new StaticModel();
-                    actor.Name = item.ShortName;
-                    actor.Model = model;
+                    var actor = new StaticModel
+                    {
+                        Name = item.ShortName,
+                        Model = model
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Editor.Instance.SceneEditing.Spawn(actor);
                     return;
@@ -911,9 +932,11 @@ namespace FlaxEditor.Viewport
                 if (assetItem.IsOfType<AudioClip>())
                 {
                     var clip = FlaxEngine.Content.LoadAsync<AudioClip>(item.ID);
-                    var actor = new AudioSource();
-                    actor.Name = item.ShortName;
-                    actor.Clip = clip;
+                    var actor = new AudioSource
+                    {
+                        Name = item.ShortName,
+                        Clip = clip
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Editor.Instance.SceneEditing.Spawn(actor);
                     return;
diff --git a/Source/Editor/Viewport/Modes/TransformGizmoMode.cs b/Source/Editor/Viewport/Modes/TransformGizmoMode.cs
index 5d2ee2bbd..acd36738c 100644
--- a/Source/Editor/Viewport/Modes/TransformGizmoMode.cs
+++ b/Source/Editor/Viewport/Modes/TransformGizmoMode.cs
@@ -3,7 +3,7 @@
 namespace FlaxEditor.Viewport.Modes
 {
     /// <summary>
-    /// The default editor mode that uses <see cref="FlaxEditor.Gizmo.TransformGizmo"/> for objects transforming.
+    /// The default editor mode that uses <see cref="FlaxEditor.Gizmo.TransformGizmoBase"/> for objects transforming.
     /// </summary>
     /// <seealso cref="FlaxEditor.Viewport.Modes.EditorGizmoMode" />
     public class TransformGizmoMode : EditorGizmoMode
diff --git a/Source/Editor/Viewport/PrefabWindowViewport.cs b/Source/Editor/Viewport/PrefabWindowViewport.cs
index 1276fc56d..dcb5ddc4a 100644
--- a/Source/Editor/Viewport/PrefabWindowViewport.cs
+++ b/Source/Editor/Viewport/PrefabWindowViewport.cs
@@ -92,7 +92,7 @@ namespace FlaxEditor.Viewport
             var transformSpaceWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
             var transformSpaceToggle = new ViewportWidgetButton(string.Empty, window.Editor.Icons.World16, null, true)
             {
-                Checked = TransformGizmo.ActiveTransformSpace == TransformGizmo.TransformSpace.World,
+                Checked = TransformGizmo.ActiveTransformSpace == TransformGizmoBase.TransformSpace.World,
                 TooltipText = "Gizmo transform space (world or local)",
                 Parent = transformSpaceWidget
             };
@@ -108,9 +108,13 @@ namespace FlaxEditor.Viewport
                 Parent = scaleSnappingWidget
             };
             enableScaleSnapping.Toggled += OnScaleSnappingToggle;
+
             var scaleSnappingCM = new ContextMenu();
-            _scaleSnapping = new ViewportWidgetButton(TransformGizmo.ScaleSnapValue.ToString(), SpriteHandle.Invalid, scaleSnappingCM);
-            _scaleSnapping.TooltipText = "Scale snapping values";
+            _scaleSnapping = new ViewportWidgetButton(TransformGizmo.ScaleSnapValue.ToString(), SpriteHandle.Invalid, scaleSnappingCM)
+            {
+                TooltipText = "Scale snapping values"
+            };
+
             for (int i = 0; i < EditorViewportScaleSnapValues.Length; i++)
             {
                 var v = EditorViewportScaleSnapValues[i];
@@ -131,9 +135,13 @@ namespace FlaxEditor.Viewport
                 Parent = rotateSnappingWidget
             };
             enableRotateSnapping.Toggled += OnRotateSnappingToggle;
+
             var rotateSnappingCM = new ContextMenu();
-            _rotateSnapping = new ViewportWidgetButton(TransformGizmo.RotationSnapValue.ToString(), SpriteHandle.Invalid, rotateSnappingCM);
-            _rotateSnapping.TooltipText = "Rotation snapping values";
+            _rotateSnapping = new ViewportWidgetButton(TransformGizmo.RotationSnapValue.ToString(), SpriteHandle.Invalid, rotateSnappingCM)
+            {
+                TooltipText = "Rotation snapping values"
+            };
+
             for (int i = 0; i < EditorViewportRotateSnapValues.Length; i++)
             {
                 var v = EditorViewportRotateSnapValues[i];
@@ -154,9 +162,13 @@ namespace FlaxEditor.Viewport
                 Parent = translateSnappingWidget
             };
             enableTranslateSnapping.Toggled += OnTranslateSnappingToggle;
+
             var translateSnappingCM = new ContextMenu();
-            _translateSnappng = new ViewportWidgetButton(TransformGizmo.TranslationSnapValue.ToString(), SpriteHandle.Invalid, translateSnappingCM);
-            _translateSnappng.TooltipText = "Position snapping values";
+            _translateSnappng = new ViewportWidgetButton(TransformGizmo.TranslationSnapValue.ToString(), SpriteHandle.Invalid, translateSnappingCM)
+            {
+                TooltipText = "Position snapping values"
+            };
+
             for (int i = 0; i < EditorViewportTranslateSnapValues.Length; i++)
             {
                 var v = EditorViewportTranslateSnapValues[i];
@@ -172,7 +184,7 @@ namespace FlaxEditor.Viewport
             var gizmoMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
             _gizmoModeTranslate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Translate16, null, true)
             {
-                Tag = TransformGizmo.Mode.Translate,
+                Tag = TransformGizmoBase.Mode.Translate,
                 TooltipText = "Translate gizmo mode",
                 Checked = true,
                 Parent = gizmoMode
@@ -180,14 +192,14 @@ namespace FlaxEditor.Viewport
             _gizmoModeTranslate.Toggled += OnGizmoModeToggle;
             _gizmoModeRotate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Rotate16, null, true)
             {
-                Tag = TransformGizmo.Mode.Rotate,
+                Tag = TransformGizmoBase.Mode.Rotate,
                 TooltipText = "Rotate gizmo mode",
                 Parent = gizmoMode
             };
             _gizmoModeRotate.Toggled += OnGizmoModeToggle;
             _gizmoModeScale = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Scale16, null, true)
             {
-                Tag = TransformGizmo.Mode.Scale,
+                Tag = TransformGizmoBase.Mode.Scale,
                 TooltipText = "Scale gizmo mode",
                 Parent = gizmoMode
             };
@@ -288,7 +300,7 @@ namespace FlaxEditor.Viewport
 
         private void OnGizmoModeToggle(ViewportWidgetButton button)
         {
-            TransformGizmo.ActiveMode = (TransformGizmo.Mode)(int)button.Tag;
+            TransformGizmo.ActiveMode = (TransformGizmoBase.Mode)(int)button.Tag;
         }
 
         private void OnTranslateSnappingToggle(ViewportWidgetButton button)
@@ -315,9 +327,9 @@ namespace FlaxEditor.Viewport
         {
             // Update all viewport widgets status
             var mode = TransformGizmo.ActiveMode;
-            _gizmoModeTranslate.Checked = mode == TransformGizmo.Mode.Translate;
-            _gizmoModeRotate.Checked = mode == TransformGizmo.Mode.Rotate;
-            _gizmoModeScale.Checked = mode == TransformGizmo.Mode.Scale;
+            _gizmoModeTranslate.Checked = mode == TransformGizmoBase.Mode.Translate;
+            _gizmoModeRotate.Checked = mode == TransformGizmoBase.Mode.Rotate;
+            _gizmoModeScale.Checked = mode == TransformGizmoBase.Mode.Scale;
         }
 
         private static readonly float[] EditorViewportScaleSnapValues =
@@ -446,7 +458,7 @@ namespace FlaxEditor.Viewport
         public void ApplyTransform(List<SceneGraphNode> selection, ref Vector3 translationDelta, ref Quaternion rotationDelta, ref Vector3 scaleDelta)
         {
             bool applyRotation = !rotationDelta.IsIdentity;
-            bool useObjCenter = TransformGizmo.ActivePivot == TransformGizmo.PivotType.ObjectCenter;
+            bool useObjCenter = TransformGizmo.ActivePivot == TransformGizmoBase.PivotType.ObjectCenter;
             Vector3 gizmoPosition = TransformGizmo.Position;
 
             // Transform selected objects
@@ -512,7 +524,7 @@ namespace FlaxEditor.Viewport
             if (TransformGizmo.IsActive)
             {
                 // Ensure player is not moving objects
-                if (TransformGizmo.ActiveAxis != TransformGizmo.Axis.None)
+                if (TransformGizmo.ActiveAxis != TransformGizmoBase.Axis.None)
                     return;
             }
             else
@@ -633,8 +645,7 @@ namespace FlaxEditor.Viewport
 
         private Vector3 PostProcessSpawnedActorLocation(Actor actor, ref Vector3 hitLocation)
         {
-            BoundingBox box;
-            Editor.GetActorEditorBox(actor, out box);
+            Editor.GetActorEditorBox(actor, out BoundingBox box);
 
             // Place the object
             var location = hitLocation - (box.Size.Length * 0.5f) * ViewDirection;
@@ -659,9 +670,11 @@ namespace FlaxEditor.Viewport
                 if (binaryAssetItem.Type == typeof(ParticleSystem))
                 {
                     var particleSystem = FlaxEngine.Content.LoadAsync<ParticleSystem>(item.ID);
-                    var actor = new ParticleEffect();
-                    actor.Name = item.ShortName;
-                    actor.ParticleSystem = particleSystem;
+                    var actor = new ParticleEffect
+                    {
+                        Name = item.ShortName,
+                        ParticleSystem = particleSystem
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Spawn(actor);
                     return;
@@ -684,9 +697,11 @@ namespace FlaxEditor.Viewport
                 if (typeof(SkinnedModel).IsAssignableFrom(binaryAssetItem.Type))
                 {
                     var model = FlaxEngine.Content.LoadAsync<SkinnedModel>(item.ID);
-                    var actor = new AnimatedModel();
-                    actor.Name = item.ShortName;
-                    actor.SkinnedModel = model;
+                    var actor = new AnimatedModel
+                    {
+                        Name = item.ShortName,
+                        SkinnedModel = model
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Spawn(actor);
                     return;
@@ -694,9 +709,11 @@ namespace FlaxEditor.Viewport
                 if (typeof(Model).IsAssignableFrom(binaryAssetItem.Type))
                 {
                     var model = FlaxEngine.Content.LoadAsync<Model>(item.ID);
-                    var actor = new StaticModel();
-                    actor.Name = item.ShortName;
-                    actor.Model = model;
+                    var actor = new StaticModel
+                    {
+                        Name = item.ShortName,
+                        Model = model
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Spawn(actor);
                     return;
@@ -704,9 +721,11 @@ namespace FlaxEditor.Viewport
                 if (typeof(AudioClip).IsAssignableFrom(binaryAssetItem.Type))
                 {
                     var clip = FlaxEngine.Content.LoadAsync<AudioClip>(item.ID);
-                    var actor = new AudioSource();
-                    actor.Name = item.ShortName;
-                    actor.Clip = clip;
+                    var actor = new AudioSource
+                    {
+                        Name = item.ShortName,
+                        Clip = clip
+                    };
                     actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
                     Spawn(actor);
                     return;
diff --git a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
index b85895528..6f6103a5d 100644
--- a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
@@ -64,15 +64,20 @@ namespace FlaxEditor.Viewport.Previews
             Task.Begin += OnBegin;
 
             // Setup preview scene
-            _previewModel = new AnimatedModel();
-            _previewModel.UseTimeScale = false;
-            _previewModel.UpdateWhenOffscreen = true;
-            //_previewModel.BoundsScale = 1000.0f;
-            _previewModel.UpdateMode = AnimatedModel.AnimationUpdateMode.Manual;
+            _previewModel = new AnimatedModel
+            {
+                UseTimeScale = false,
+                UpdateWhenOffscreen = true,
+                //_previewModel.BoundsScale = 1000.0f;
+                UpdateMode = AnimatedModel.AnimationUpdateMode.Manual
+            };
+
             _previewNodesModel = FlaxEngine.Content.CreateVirtualAsset<Model>();
             _previewNodesModel.SetupLODs(new[] { 1 });
-            _previewNodesActor = new StaticModel();
-            _previewNodesActor.Model = _previewNodesModel;
+            _previewNodesActor = new StaticModel
+            {
+                Model = _previewNodesModel
+            };
             _previewNodesActor.SetMaterial(0, FlaxEngine.Content.LoadAsyncInternal<MaterialBase>(EditorAssets.WiresDebugMaterial));
 
             // Link actors for rendering
@@ -84,8 +89,10 @@ namespace FlaxEditor.Viewport.Previews
                 // Preview LOD
                 {
                     var previewLOD = ViewWidgetButtonMenu.AddButton("Preview LOD");
-                    var previewLODValue = new IntValueBox(-1, 90, 2, 70.0f, -1, 10, 0.02f);
-                    previewLODValue.Parent = previewLOD;
+                    var previewLODValue = new IntValueBox(-1, 90, 2, 70.0f, -1, 10, 0.02f)
+                    {
+                        Parent = previewLOD
+                    };
                     previewLODValue.ValueChanged += () => _previewModel.ForcedLOD = previewLODValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => previewLODValue.Value = _previewModel.ForcedLOD;
                 }
diff --git a/Source/Editor/Viewport/Previews/AssetPreview.cs b/Source/Editor/Viewport/Previews/AssetPreview.cs
index 9bf3573a1..791e98143 100644
--- a/Source/Editor/Viewport/Previews/AssetPreview.cs
+++ b/Source/Editor/Viewport/Previews/AssetPreview.cs
@@ -95,26 +95,36 @@ namespace FlaxEditor.Viewport.Previews
             }
 
             // Setup preview scene
-            PreviewLight = new DirectionalLight();
-            PreviewLight.Brightness = 8.0f;
-            PreviewLight.ShadowsMode = ShadowsCastingMode.None;
-            PreviewLight.Orientation = Quaternion.Euler(new Vector3(52.1477f, -109.109f, -111.739f));
+            PreviewLight = new DirectionalLight
+            {
+                Brightness = 8.0f,
+                ShadowsMode = ShadowsCastingMode.None,
+                Orientation = Quaternion.Euler(new Vector3(52.1477f, -109.109f, -111.739f))
+            };
             //
-            EnvProbe = new EnvironmentProbe();
-            EnvProbe.AutoUpdate = false;
-            EnvProbe.CustomProbe = FlaxEngine.Content.LoadAsyncInternal<CubeTexture>(EditorAssets.DefaultSkyCubeTexture);
+            EnvProbe = new EnvironmentProbe
+            {
+                AutoUpdate = false,
+                CustomProbe = FlaxEngine.Content.LoadAsyncInternal<CubeTexture>(EditorAssets.DefaultSkyCubeTexture)
+            };
             //
-            Sky = new Sky();
-            Sky.SunLight = PreviewLight;
-            Sky.SunPower = 9.0f;
+            Sky = new Sky
+            {
+                SunLight = PreviewLight,
+                SunPower = 9.0f
+            };
             //
-            SkyLight = new SkyLight();
-            SkyLight.Mode = SkyLight.Modes.CustomTexture;
-            SkyLight.Brightness = 2.1f;
-            SkyLight.CustomTexture = EnvProbe.CustomProbe;
+            SkyLight = new SkyLight()
+            {
+                Mode = SkyLight.Modes.CustomTexture,
+                Brightness = 2.1f,
+                CustomTexture = EnvProbe.CustomProbe
+            };
             //
-            PostFxVolume = new PostFxVolume();
-            PostFxVolume.IsBounded = false;
+            PostFxVolume = new PostFxVolume
+            {
+                IsBounded = false
+            };
 
             // Link actors for rendering
             Task.ActorsSource = ActorsSources.CustomActors;
diff --git a/Source/Editor/Viewport/Previews/MaterialPreview.cs b/Source/Editor/Viewport/Previews/MaterialPreview.cs
index 4f7d71b18..c120531e8 100644
--- a/Source/Editor/Viewport/Previews/MaterialPreview.cs
+++ b/Source/Editor/Viewport/Previews/MaterialPreview.cs
@@ -202,9 +202,11 @@ namespace FlaxEditor.Viewport.Previews
             // Decal
             if (decalMaterial && _decal == null)
             {
-                _decal = new Decal();
-                _decal.Size = new Vector3(100.0f);
-                _decal.LocalOrientation = Quaternion.RotationZ(Mathf.PiOverTwo);
+                _decal = new Decal
+                {
+                    Size = new Vector3(100.0f),
+                    LocalOrientation = Quaternion.RotationZ(Mathf.PiOverTwo)
+                };
                 Task.AddCustomActor(_decal);
             }
             if (_decal)
@@ -254,9 +256,11 @@ namespace FlaxEditor.Viewport.Previews
             // Particle
             if (particleMaterial && _particleEffect == null)
             {
-                _particleEffect = new ParticleEffect();
-                _particleEffect.IsLooping = true;
-                _particleEffect.UseTimeScale = false;
+                _particleEffect = new ParticleEffect
+                {
+                    IsLooping = true,
+                    UseTimeScale = false
+                };
                 Task.AddCustomActor(_particleEffect);
             }
             if (_particleEffect != null)
diff --git a/Source/Editor/Viewport/Previews/ModelPreview.cs b/Source/Editor/Viewport/Previews/ModelPreview.cs
index aa03d0ee2..7055edbe9 100644
--- a/Source/Editor/Viewport/Previews/ModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/ModelPreview.cs
@@ -53,8 +53,10 @@ namespace FlaxEditor.Viewport.Previews
                 // Preview LOD
                 {
                     var previewLOD = ViewWidgetButtonMenu.AddButton("Preview LOD");
-                    var previewLODValue = new IntValueBox(-1, 90, 2, 70.0f, -1, 10, 0.02f);
-                    previewLODValue.Parent = previewLOD;
+                    var previewLODValue = new IntValueBox(-1, 90, 2, 70.0f, -1, 10, 0.02f)
+                    {
+                        Parent = previewLOD
+                    };
                     previewLODValue.ValueChanged += () => _previewModel.ForcedLOD = previewLODValue.Value;
                     ViewWidgetButtonMenu.VisibleChanged += control => previewLODValue.Value = _previewModel.ForcedLOD;
                 }
diff --git a/Source/Editor/Viewport/Previews/ParticleEmitterPreview.cs b/Source/Editor/Viewport/Previews/ParticleEmitterPreview.cs
index 638c8324c..f9644493f 100644
--- a/Source/Editor/Viewport/Previews/ParticleEmitterPreview.cs
+++ b/Source/Editor/Viewport/Previews/ParticleEmitterPreview.cs
@@ -67,8 +67,10 @@ namespace FlaxEditor.Viewport.Previews
             if (useWidgets)
             {
                 var playbackDuration = ViewWidgetButtonMenu.AddButton("Duration");
-                var playbackDurationValue = new FloatValueBox(_playbackDuration, 90, 2, 70.0f, 0.1f, 1000000.0f, 0.1f);
-                playbackDurationValue.Parent = playbackDuration;
+                var playbackDurationValue = new FloatValueBox(_playbackDuration, 90, 2, 70.0f, 0.1f, 1000000.0f, 0.1f)
+                {
+                    Parent = playbackDuration
+                };
                 playbackDurationValue.ValueChanged += () => PlaybackDuration = playbackDurationValue.Value;
                 ViewWidgetButtonMenu.VisibleChanged += control => playbackDurationValue.Value = PlaybackDuration;
             }
diff --git a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
index ad2502b23..8b4589271 100644
--- a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
+++ b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
@@ -56,8 +56,10 @@ namespace FlaxEditor.Viewport.Previews
                 {
                     if (!_boundsModel)
                     {
-                        _boundsModel = new StaticModel();
-                        _boundsModel.Model = FlaxEngine.Content.LoadAsyncInternal<Model>("Editor/Gizmo/WireBox");
+                        _boundsModel = new StaticModel
+                        {
+                            Model = FlaxEngine.Content.LoadAsyncInternal<Model>("Editor/Gizmo/WireBox")
+                        };
                         _boundsModel.Model.WaitForLoaded();
                         _boundsModel.SetMaterial(0, FlaxEngine.Content.LoadAsyncInternal<MaterialBase>("Editor/Gizmo/MaterialWireFocus"));
                         Task.AddCustomActor(_boundsModel);
@@ -96,12 +98,14 @@ namespace FlaxEditor.Viewport.Previews
                 {
                     if (!_originModel)
                     {
-                        _originModel = new StaticModel();
-                        _originModel.Model = FlaxEngine.Content.LoadAsyncInternal<Model>("Editor/Primitives/Sphere");
+                        _originModel = new StaticModel
+                        {
+                            Model = FlaxEngine.Content.LoadAsyncInternal<Model>("Editor/Primitives/Sphere"),
+                            Position = _previewEffect.Position,
+                            Scale = new Vector3(0.1f)
+                        };
                         _originModel.Model.WaitForLoaded();
                         _originModel.SetMaterial(0, FlaxEngine.Content.LoadAsyncInternal<MaterialBase>("Editor/Gizmo/MaterialAxisFocus"));
-                        _originModel.Position = _previewEffect.Position;
-                        _originModel.Scale = new Vector3(0.1f);
                         Task.AddCustomActor(_originModel);
                     }
                     else if (!_originModel.IsActive)
@@ -147,10 +151,12 @@ namespace FlaxEditor.Viewport.Previews
         : base(useWidgets, new FPSCamera())
         {
             // Setup preview scene
-            _previewEffect = new ParticleEffect();
-            _previewEffect.UseTimeScale = false;
-            _previewEffect.IsLooping = true;
-            _previewEffect.CustomViewRenderTask = Task;
+            _previewEffect = new ParticleEffect
+            {
+                UseTimeScale = false,
+                IsLooping = true,
+                CustomViewRenderTask = Task
+            };
 
             // Link actors for rendering
             Task.AddCustomActor(_previewEffect);
diff --git a/Source/Editor/Windows/Assets/AnimationGraphWindow.cs b/Source/Editor/Windows/Assets/AnimationGraphWindow.cs
index a728e9281..f25b51612 100644
--- a/Source/Editor/Windows/Assets/AnimationGraphWindow.cs
+++ b/Source/Editor/Windows/Assets/AnimationGraphWindow.cs
@@ -62,10 +62,12 @@ namespace FlaxEditor.Windows.Assets
                 _showFloorButton.IndexInParent = 1;
 
                 // Floor model
-                _floorModel = new StaticModel();
-                _floorModel.Position = new Vector3(0, -25, 0);
-                _floorModel.Scale = new Vector3(5, 0.5f, 5);
-                _floorModel.Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax"));
+                _floorModel = new StaticModel
+                {
+                    Position = new Vector3(0, -25, 0),
+                    Scale = new Vector3(5, 0.5f, 5),
+                    Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax"))
+                };
                 Task.AddCustomActor(_floorModel);
 
                 // Enable shadows
diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs
index fc6092fb7..fde6ec3cb 100644
--- a/Source/Editor/Windows/Assets/AnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/AnimationWindow.cs
@@ -260,15 +260,13 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-            Timeline.TimeShowModes value2;
-            bool value3;
-
-            if (float.TryParse(node.GetAttribute("TimelineSplitter"), out value1))
+            if (float.TryParse(node.GetAttribute("TimelineSplitter"), out float value1))
                 _timeline.Splitter.SplitterValue = value1;
-            if (Enum.TryParse(node.GetAttribute("TimeShowMode"), out value2))
+
+            if (Enum.TryParse(node.GetAttribute("TimeShowMode"), out Timeline.TimeShowModes value2))
                 _timeline.TimeShowMode = value2;
-            if (bool.TryParse(node.GetAttribute("ShowPreviewValues"), out value3))
+
+            if (bool.TryParse(node.GetAttribute("ShowPreviewValues"), out bool value3))
                 _timeline.ShowPreviewValues = value3;
         }
 
diff --git a/Source/Editor/Windows/Assets/AudioClipWindow.cs b/Source/Editor/Windows/Assets/AudioClipWindow.cs
index 009a1ff3d..39230a3c2 100644
--- a/Source/Editor/Windows/Assets/AudioClipWindow.cs
+++ b/Source/Editor/Windows/Assets/AudioClipWindow.cs
@@ -44,8 +44,7 @@ namespace FlaxEditor.Windows.Assets
                     {
                         var audio = window.Asset;
                         AudioDataInfo info = audio.Info;
-                        int originalSize, importedSize;
-                        Editor.Internal_GetAudioClipMetadata(FlaxEngine.Object.GetUnmanagedPtr(audio), out originalSize, out importedSize);
+                        Editor.Internal_GetAudioClipMetadata(FlaxEngine.Object.GetUnmanagedPtr(audio), out int originalSize, out int importedSize);
 
                         var group = layout.Group("General");
                         group.Label("Format: " + audio.Format);
@@ -220,9 +219,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/CollisionDataWindow.cs b/Source/Editor/Windows/Assets/CollisionDataWindow.cs
index 26b74931b..23f9ae5ed 100644
--- a/Source/Editor/Windows/Assets/CollisionDataWindow.cs
+++ b/Source/Editor/Windows/Assets/CollisionDataWindow.cs
@@ -305,9 +305,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/CubeTextureWindow.cs b/Source/Editor/Windows/Assets/CubeTextureWindow.cs
index 1a0ae3770..641441de7 100644
--- a/Source/Editor/Windows/Assets/CubeTextureWindow.cs
+++ b/Source/Editor/Windows/Assets/CubeTextureWindow.cs
@@ -212,9 +212,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/FontWindow.cs b/Source/Editor/Windows/Assets/FontWindow.cs
index d0bd3aa8b..e33076606 100644
--- a/Source/Editor/Windows/Assets/FontWindow.cs
+++ b/Source/Editor/Windows/Assets/FontWindow.cs
@@ -39,8 +39,10 @@ namespace FlaxEditor.Windows.Assets
 
             public void Get(out FontOptions options)
             {
-                options = new FontOptions();
-                options.Hinting = Hinting;
+                options = new FontOptions
+                {
+                    Hinting = Hinting
+                };
                 if (AntiAliasing)
                     options.Flags |= FontFlags.AntiAliasing;
                 if (Bold)
diff --git a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
index 6087eb86b..4f67e4f72 100644
--- a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
+++ b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
@@ -509,9 +509,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/ModelBaseWindow.cs b/Source/Editor/Windows/Assets/ModelBaseWindow.cs
index 9bb500deb..74b690f98 100644
--- a/Source/Editor/Windows/Assets/ModelBaseWindow.cs
+++ b/Source/Editor/Windows/Assets/ModelBaseWindow.cs
@@ -193,9 +193,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/ModelWindow.cs b/Source/Editor/Windows/Assets/ModelWindow.cs
index 533c9694c..e8a054222 100644
--- a/Source/Editor/Windows/Assets/ModelWindow.cs
+++ b/Source/Editor/Windows/Assets/ModelWindow.cs
@@ -59,11 +59,13 @@ namespace FlaxEditor.Windows.Assets
                 _showCurrentLODButton.IndexInParent = 2;
 
                 // Floor model
-                _floorModel = new StaticModel();
-                _floorModel.Position = new Vector3(0, -25, 0);
-                _floorModel.Scale = new Vector3(5, 0.5f, 5);
-                _floorModel.Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax"));
-                _floorModel.IsActive = false;
+                _floorModel = new StaticModel
+                {
+                    Position = new Vector3(0, -25, 0),
+                    Scale = new Vector3(5, 0.5f, 5),
+                    Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax")),
+                    IsActive = false
+                };
                 Task.AddCustomActor(_floorModel);
 
                 // Enable shadows
@@ -831,8 +833,10 @@ namespace FlaxEditor.Windows.Assets
             _tabs.AddTab(new ImportTab(this));
 
             // Highlight actor (used to highlight selected material slot, see UpdateEffectsOnAsset)
-            _highlightActor = new StaticModel();
-            _highlightActor.IsActive = false;
+            _highlightActor = new StaticModel
+            {
+                IsActive = false
+            };
             _preview.Task.AddCustomActor(_highlightActor);
         }
 
diff --git a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
index fbf1a2d01..929e81b61 100644
--- a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
+++ b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
@@ -557,12 +557,12 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split1"), out value1))
+            if (float.TryParse(node.GetAttribute("Split1"), out float value1))
                 _split1.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Split2"), out value1))
                 _split2.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Split3"), out value1))
                 _timeline.Splitter.SplitterValue = value1;
         }
diff --git a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
index bded7e147..e671ba1de 100644
--- a/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
+++ b/Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
@@ -73,8 +73,10 @@ namespace FlaxEditor.Windows.Assets
 
             // Create popup
 
-            var contextMenu = new ContextMenu();
-            contextMenu.MinimumWidth = 120;
+            var contextMenu = new ContextMenu
+            {
+                MinimumWidth = 120
+            };
 
             // Basic editing options
 
@@ -213,20 +215,17 @@ namespace FlaxEditor.Windows.Assets
         {
             if (actor == null)
                 throw new ArgumentNullException(nameof(actor));
-            if (parent == null)
-                throw new ArgumentNullException(nameof(parent));
 
             // Link it
-            actor.Parent = parent;
+            actor.Parent = parent ?? throw new ArgumentNullException(nameof(parent));
 
             // Peek spawned node
             var actorNode = SceneGraphFactory.FindNode(actor.ID) as ActorNode ?? SceneGraphFactory.BuildActorNode(actor);
             if (actorNode == null)
                 throw new InvalidOperationException("Failed to create scene node for the spawned actor.");
+
             var parentNode = SceneGraphFactory.FindNode(parent.ID) as ActorNode;
-            if (parentNode == null)
-                throw new InvalidOperationException("Missing scene graph node for the spawned parent actor.");
-            actorNode.ParentNode = parentNode;
+            actorNode.ParentNode = parentNode ?? throw new InvalidOperationException("Missing scene graph node for the spawned parent actor.");
 
             // Call post spawn action (can possibly setup custom default values)
             actorNode.PostSpawn();
diff --git a/Source/Editor/Windows/Assets/PrefabWindow.cs b/Source/Editor/Windows/Assets/PrefabWindow.cs
index 4cc7898ee..e14c548a9 100644
--- a/Source/Editor/Windows/Assets/PrefabWindow.cs
+++ b/Source/Editor/Windows/Assets/PrefabWindow.cs
@@ -158,9 +158,9 @@ namespace FlaxEditor.Windows.Assets
             _toolStripUndo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
             _toolStripRedo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolStripTranslate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Translate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmo.Mode.Translate).LinkTooltip("Change Gizmo tool mode to Translate (1)");
-            _toolStripRotate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Rotate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmo.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)");
-            _toolStripScale = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Scale32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmo.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)");
+            _toolStripTranslate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Translate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Translate).LinkTooltip("Change Gizmo tool mode to Translate (1)");
+            _toolStripRotate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Rotate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)");
+            _toolStripScale = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Scale32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)");
             _toolstrip.AddSeparator();
             _toolStripLiveReload = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Reload32, () => LiveReload = !LiveReload).SetChecked(true).SetAutoCheck(true).LinkTooltip("Live changes preview (applies prefab changes on modification by auto)");
 
@@ -311,9 +311,9 @@ namespace FlaxEditor.Windows.Assets
             _toolStripRedo.Enabled = undoRedo.CanRedo;
             //
             var gizmoMode = gizmo.ActiveMode;
-            _toolStripTranslate.Checked = gizmoMode == TransformGizmo.Mode.Translate;
-            _toolStripRotate.Checked = gizmoMode == TransformGizmo.Mode.Rotate;
-            _toolStripScale.Checked = gizmoMode == TransformGizmo.Mode.Scale;
+            _toolStripTranslate.Checked = gizmoMode == TransformGizmoBase.Mode.Translate;
+            _toolStripRotate.Checked = gizmoMode == TransformGizmoBase.Mode.Rotate;
+            _toolStripScale.Checked = gizmoMode == TransformGizmoBase.Mode.Scale;
             //
             _toolStripLiveReload.Checked = _liveReload;
 
@@ -401,8 +401,7 @@ namespace FlaxEditor.Windows.Assets
             {
                 _focusCamera = false;
 
-                BoundingSphere bounds;
-                Editor.GetActorEditorSphere(_viewport.Instance, out bounds);
+                Editor.GetActorEditorSphere(_viewport.Instance, out BoundingSphere bounds);
                 _viewport.ViewPosition = bounds.Center - _viewport.ViewDirection * (bounds.Radius * 1.2f);
             }
 
@@ -428,20 +427,17 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
 
-            if (float.TryParse(node.GetAttribute("Split1"), out value1))
+            if (float.TryParse(node.GetAttribute("Split1"), out float value1))
                 _split1.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Split2"), out value1))
                 _split2.SplitterValue = value1;
 
-            bool value2;
-
-            if (bool.TryParse(node.GetAttribute("LiveReload"), out value2))
+            if (bool.TryParse(node.GetAttribute("LiveReload"), out bool value2))
                 LiveReload = value2;
 
-            TransformGizmo.Mode value3;
-            if (Enum.TryParse(node.GetAttribute("GizmoMode"), out value3))
+            if (Enum.TryParse(node.GetAttribute("GizmoMode"), out TransformGizmoBase.Mode value3))
                 Viewport.TransformGizmo.ActiveMode = value3;
         }
 
diff --git a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
index c18edc716..c162eac3a 100644
--- a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
@@ -890,19 +890,18 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-            Guid value2;
-            Timeline.TimeShowModes value3;
-            bool value4;
-
-            if (float.TryParse(node.GetAttribute("TimelineSplitter"), out value1))
+            if (float.TryParse(node.GetAttribute("TimelineSplitter"), out float value1))
                 _timeline.Splitter.SplitterValue = value1;
-            if (Guid.TryParse(node.GetAttribute("SelectedPlayer"), out value2))
+
+            if (Guid.TryParse(node.GetAttribute("SelectedPlayer"), out Guid value2))
                 _cachedPlayerId = value2;
-            if (Enum.TryParse(node.GetAttribute("TimeShowMode"), out value3))
+
+            if (Enum.TryParse(node.GetAttribute("TimeShowMode"), out Timeline.TimeShowModes value3))
                 _timeline.TimeShowMode = value3;
-            if (bool.TryParse(node.GetAttribute("ShowPreviewValues"), out value4))
+
+            if (bool.TryParse(node.GetAttribute("ShowPreviewValues"), out bool value4))
                 _timeline.ShowPreviewValues = value4;
+
             if (bool.TryParse(node.GetAttribute("ShowSelected3dTrack"), out value4))
                 _timeline.ShowSelected3dTrack = value4;
         }
diff --git a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs
index 8ead2cba0..86066f293 100644
--- a/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs
+++ b/Source/Editor/Windows/Assets/SkeletonMaskWindow.cs
@@ -296,9 +296,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
index c599e7e2a..b002aa0fe 100644
--- a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
+++ b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
@@ -59,11 +59,13 @@ namespace FlaxEditor.Windows.Assets
                 _showCurrentLODButton.IndexInParent = 2;
 
                 // Floor model
-                _floorModel = new StaticModel();
-                _floorModel.Position = new Vector3(0, -25, 0);
-                _floorModel.Scale = new Vector3(5, 0.5f, 5);
-                _floorModel.Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax"));
-                _floorModel.IsActive = false;
+                _floorModel = new StaticModel
+                {
+                    Position = new Vector3(0, -25, 0),
+                    Scale = new Vector3(5, 0.5f, 5),
+                    Model = FlaxEngine.Content.LoadAsync<Model>(StringUtils.CombinePaths(Globals.EngineContentFolder, "Editor/Primitives/Cube.flax")),
+                    IsActive = false
+                };
                 Task.AddCustomActor(_floorModel);
 
                 // Enable shadows
@@ -929,8 +931,10 @@ namespace FlaxEditor.Windows.Assets
             _tabs.AddTab(new ImportTab(this));
 
             // Highlight actor (used to highlight selected material slot, see UpdateEffectsOnAsset)
-            _highlightActor = new AnimatedModel();
-            _highlightActor.IsActive = false;
+            _highlightActor = new AnimatedModel
+            {
+                IsActive = false
+            };
             _preview.Task.AddCustomActor(_highlightActor);
         }
 
diff --git a/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs b/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs
index b4c8f3145..e82c1dd12 100644
--- a/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs
+++ b/Source/Editor/Windows/Assets/SpriteAtlasWindow.cs
@@ -163,8 +163,7 @@ namespace FlaxEditor.Windows.Assets
                 UpdateSprites();
 
                 // Try to restore target asset texture import options (useful for fast reimport)
-                TextureImportSettings.InternalOptions options;
-                if (TextureImportEntry.Internal_GetTextureImportOptions(win.Item.Path, out options))
+                if (TextureImportEntry.Internal_GetTextureImportOptions(win.Item.Path, out TextureImportSettings.InternalOptions options))
                 {
                     // Restore settings
                     ImportSettings.FromInternal(ref options);
@@ -352,9 +351,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/TextureWindow.cs b/Source/Editor/Windows/Assets/TextureWindow.cs
index 81a258c3f..9f6698528 100644
--- a/Source/Editor/Windows/Assets/TextureWindow.cs
+++ b/Source/Editor/Windows/Assets/TextureWindow.cs
@@ -214,9 +214,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/Assets/VisualScriptWindow.cs b/Source/Editor/Windows/Assets/VisualScriptWindow.cs
index a9b62df62..8207740f1 100644
--- a/Source/Editor/Windows/Assets/VisualScriptWindow.cs
+++ b/Source/Editor/Windows/Assets/VisualScriptWindow.cs
@@ -1107,9 +1107,7 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/ContentWindow.ContextMenu.cs b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
index f81220ac4..079df66a5 100644
--- a/Source/Editor/Windows/ContentWindow.ContextMenu.cs
+++ b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
@@ -40,8 +40,11 @@ namespace FlaxEditor.Windows
             // Create context menu
             ContextMenuButton b;
             ContextMenuChildMenu c;
-            ContextMenu cm = new ContextMenu();
-            cm.Tag = item;
+            ContextMenu cm = new ContextMenu
+            {
+                Tag = item
+            };
+
             if (isTreeNode)
             {
                 b = cm.AddButton("Expand All", OnExpandAllClicked);
@@ -52,6 +55,7 @@ namespace FlaxEditor.Windows
 
                 cm.AddSeparator();
             }
+
             if (item is ContentFolder contentFolder && contentFolder.Node is ProjectTreeNode)
             {
                 cm.AddButton("Show in explorer", () => FileSystem.ShowFileExplorer(CurrentViewFolder.Path));
@@ -75,8 +79,7 @@ namespace FlaxEditor.Windows
 
                     if (item is BinaryAssetItem binaryAsset)
                     {
-                        string importPath;
-                        if (!binaryAsset.GetImportPath(out importPath))
+                        if (!binaryAsset.GetImportPath(out string importPath))
                         {
                             string importLocation = System.IO.Path.GetDirectoryName(importPath);
                             if (!string.IsNullOrEmpty(importLocation) && System.IO.Directory.Exists(importLocation))
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 145c0d972..9b7ec8fd9 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -177,8 +177,10 @@ namespace FlaxEditor.Windows
             showFileExtensionsButton.AutoCheck = true;
 
             var viewScale = menu.AddButton("View Scale");
-            var scaleValue = new FloatValueBox(1, 75, 2, 50.0f, 0.3f, 3.0f, 0.01f);
-            scaleValue.Parent = viewScale;
+            var scaleValue = new FloatValueBox(1, 75, 2, 50.0f, 0.3f, 3.0f, 0.01f)
+            {
+                Parent = viewScale
+            };
             scaleValue.ValueChanged += () => View.ViewScale = scaleValue.Value;
             menu.VisibleChanged += control => { scaleValue.Value = View.ViewScale; };
 
@@ -742,11 +744,15 @@ namespace FlaxEditor.Windows
         public override void OnInit()
         {
             // Setup content root node
-            _root = new RootContentTreeNode();
-            _root.ChildrenIndent = 0;
+            _root = new RootContentTreeNode
+            {
+                ChildrenIndent = 0
+            };
             _root.Expand(true);
+
             foreach (var project in Editor.ContentDatabase.Projects)
                 AddFolder2Root(project);
+
             Editor.ContentDatabase.Game?.Expand(true);
             _tree.Margin = new Margin(0.0f, 0.0f, -16.0f, 2.0f); // Hide root node
             _tree.AddChild(_root);
@@ -856,15 +862,15 @@ namespace FlaxEditor.Windows
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-            bool value2;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
+
             if (float.TryParse(node.GetAttribute("Scale"), out value1))
                 _view.ViewScale = value1;
-            if (bool.TryParse(node.GetAttribute("ShowFileExtensions"), out value2))
+
+            if (bool.TryParse(node.GetAttribute("ShowFileExtensions"), out bool value2))
                 _view.ShowFileExtensions = value2;
+
             if (Enum.TryParse(node.GetAttribute("ViewType"), out ContentViewType viewType))
                 _view.ViewType = viewType;
         }
diff --git a/Source/Editor/Windows/DebugLogWindow.cs b/Source/Editor/Windows/DebugLogWindow.cs
index 8aad9fc35..55781438e 100644
--- a/Source/Editor/Windows/DebugLogWindow.cs
+++ b/Source/Editor/Windows/DebugLogWindow.cs
@@ -592,9 +592,7 @@ namespace FlaxEditor.Windows
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            float value1;
-
-            if (float.TryParse(node.GetAttribute("Split"), out value1))
+            if (float.TryParse(node.GetAttribute("Split"), out float value1))
                 _split.SplitterValue = value1;
         }
 
diff --git a/Source/Editor/Windows/EditGameWindow.cs b/Source/Editor/Windows/EditGameWindow.cs
index a9f85490d..26f725a82 100644
--- a/Source/Editor/Windows/EditGameWindow.cs
+++ b/Source/Editor/Windows/EditGameWindow.cs
@@ -434,29 +434,34 @@ namespace FlaxEditor.Windows
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            bool value1;
-            float value2;
-            long value3;
-
-            if (bool.TryParse(node.GetAttribute("GridEnabled"), out value1))
+            if (bool.TryParse(node.GetAttribute("GridEnabled"), out bool value1))
                 Viewport.Grid.Enabled = value1;
+
             if (bool.TryParse(node.GetAttribute("ShowFpsCounter"), out value1))
                 Viewport.ShowFpsCounter = value1;
+
             if (bool.TryParse(node.GetAttribute("ShowNavigation"), out value1))
                 Viewport.ShowNavigation = value1;
-            if (float.TryParse(node.GetAttribute("NearPlane"), out value2))
+
+            if (float.TryParse(node.GetAttribute("NearPlane"), out float value2))
                 Viewport.NearPlane = value2;
+
             if (float.TryParse(node.GetAttribute("FarPlane"), out value2))
                 Viewport.FarPlane = value2;
+
             if (float.TryParse(node.GetAttribute("FieldOfView"), out value2))
                 Viewport.FieldOfView = value2;
+
             if (float.TryParse(node.GetAttribute("MovementSpeed"), out value2))
                 Viewport.MovementSpeed = value2;
+
             if (float.TryParse(node.GetAttribute("OrthographicScale"), out value2))
                 Viewport.OrthographicScale = value2;
+
             if (bool.TryParse(node.GetAttribute("UseOrthographicProjection"), out value1))
                 Viewport.UseOrthographicProjection = value1;
-            if (long.TryParse(node.GetAttribute("ViewFlags"), out value3))
+
+            if (long.TryParse(node.GetAttribute("ViewFlags"), out long value3))
                 Viewport.Task.ViewFlags = (ViewFlags)value3;
 
             // Reset view flags if opening with different engine version (ViewFlags enum could be modified)
diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs
index 858f0e0ba..2968b0645 100644
--- a/Source/Editor/Windows/GameWindow.cs
+++ b/Source/Editor/Windows/GameWindow.cs
@@ -255,16 +255,20 @@ namespace FlaxEditor.Windows
             // Viewport Brightness
             {
                 var brightness = menu.AddButton("Viewport Brightness");
-                var brightnessValue = new FloatValueBox(_viewport.Brightness, 140, 2, 50.0f, 0.001f, 10.0f, 0.001f);
-                brightnessValue.Parent = brightness;
+                var brightnessValue = new FloatValueBox(_viewport.Brightness, 140, 2, 50.0f, 0.001f, 10.0f, 0.001f)
+                {
+                    Parent = brightness
+                };
                 brightnessValue.ValueChanged += () => _viewport.Brightness = brightnessValue.Value;
             }
 
             // Viewport Resolution
             {
                 var resolution = menu.AddButton("Viewport Resolution");
-                var resolutionValue = new FloatValueBox(_viewport.ResolutionScale, 140, 2, 50.0f, 0.1f, 4.0f, 0.001f);
-                resolutionValue.Parent = resolution;
+                var resolutionValue = new FloatValueBox(_viewport.ResolutionScale, 140, 2, 50.0f, 0.1f, 4.0f, 0.001f)
+                {
+                    Parent = resolution
+                };
                 resolutionValue.ValueChanged += () => _viewport.ResolutionScale = resolutionValue.Value;
             }
 
diff --git a/Source/Editor/Windows/OutputLogWindow.cs b/Source/Editor/Windows/OutputLogWindow.cs
index cd13e4cdc..18ec939c9 100644
--- a/Source/Editor/Windows/OutputLogWindow.cs
+++ b/Source/Editor/Windows/OutputLogWindow.cs
@@ -615,9 +615,7 @@ namespace FlaxEditor.Windows
         /// <inheritdoc />
         public override void OnLayoutDeserialize(XmlElement node)
         {
-            int value1;
-
-            if (int.TryParse(node.GetAttribute("LogTypeShowMask"), out value1))
+            if (int.TryParse(node.GetAttribute("LogTypeShowMask"), out int value1))
                 _logTypeShowMask = value1;
         }
 
diff --git a/Source/Editor/Windows/Profiler/GPU.cs b/Source/Editor/Windows/Profiler/GPU.cs
index b7cee5517..cd1c4cfed 100644
--- a/Source/Editor/Windows/Profiler/GPU.cs
+++ b/Source/Editor/Windows/Profiler/GPU.cs
@@ -157,7 +157,7 @@ namespace FlaxEditor.Windows.Profiler
             float width = (float)(e.Time * scale);
             string name = new string(e.Name);
 
-            var control = new Timeline.Event(x, e.Depth, width)
+            new Timeline.Event(x, e.Depth, width)
             {
                 Name = name,
                 TooltipText = string.Format("{0}, {1} ms", name, ((int)(e.Time * 10000.0) / 10000.0f)),
diff --git a/Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs b/Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
index f407017df..9b028dfef 100644
--- a/Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
@@ -30,8 +30,10 @@ namespace FlaxEditor.Windows
 
             // Create popup
 
-            var contextMenu = new ContextMenu();
-            contextMenu.MinimumWidth = 120;
+            var contextMenu = new ContextMenu
+            {
+                MinimumWidth = 120
+            };
 
             // Expand/collapse
 
diff --git a/Source/Editor/Windows/ToolboxWindow.cs b/Source/Editor/Windows/ToolboxWindow.cs
index 63e1f1f05..7e4a26548 100644
--- a/Source/Editor/Windows/ToolboxWindow.cs
+++ b/Source/Editor/Windows/ToolboxWindow.cs
@@ -199,8 +199,7 @@ namespace FlaxEditor.Windows
             {
                 var text = actorType.Name;
 
-                QueryFilterHelper.Range[] ranges;
-                if (!QueryFilterHelper.Match(filterText, text, out ranges))
+                if (!QueryFilterHelper.Match(filterText, text, out QueryFilterHelper.Range[] ranges))
                     continue;
 
                 var item = _groupSearch.AddChild(CreateActorItem(CustomEditors.CustomEditorsUtil.GetPropertyNameUI(text), actorType));
diff --git a/Source/Editor/Windows/VisualScriptDebuggerWindow.cs b/Source/Editor/Windows/VisualScriptDebuggerWindow.cs
index 897f30552..b9f20ff2f 100644
--- a/Source/Editor/Windows/VisualScriptDebuggerWindow.cs
+++ b/Source/Editor/Windows/VisualScriptDebuggerWindow.cs
@@ -119,8 +119,11 @@ namespace FlaxEditor.Windows
 
             private void OnTreeRightClick(TreeNode treeNode, Vector2 location)
             {
-                var menu = new ContextMenu();
-                menu.Tag = treeNode.Tag;
+                var menu = new ContextMenu
+                {
+                    Tag = treeNode.Tag
+                };
+
                 menu.AddButton("Show node", button =>
                 {
                     var node = Node.GetNode(button.ParentContextMenu.Tag);
diff --git a/Source/Engine/Animations/Curve.cs b/Source/Engine/Animations/Curve.cs
index 3a8ddc100..7232e9acf 100644
--- a/Source/Engine/Animations/Curve.cs
+++ b/Source/Engine/Animations/Curve.cs
@@ -314,7 +314,7 @@ namespace FlaxEngine
             if (time < start)
             {
                 if (loop)
-                    time = time + (Mathf.Floor(end - time) / length) * length;
+                    time += (Mathf.Floor(end - time) / length) * length;
                 else
                     time = start;
             }
@@ -323,7 +323,7 @@ namespace FlaxEngine
             if (time > end)
             {
                 if (loop)
-                    time = time - Mathf.Floor((time - start) / length) * length;
+                    time -= Mathf.Floor((time - start) / length) * length;
                 else
                     time = end;
             }
@@ -422,7 +422,7 @@ namespace FlaxEngine
         {
             if (Keyframes.Length == 0)
             {
-                result = new Keyframe(time, default(T));
+                result = new Keyframe(time, default);
                 return;
             }
 
@@ -624,7 +624,7 @@ namespace FlaxEngine
             {
                 Time = time;
                 Value = value;
-                TangentIn = TangentOut = default(T);
+                TangentIn = TangentOut = default;
             }
 
             /// <summary>
@@ -699,7 +699,7 @@ namespace FlaxEngine
         {
             if (Keyframes.Length == 0)
             {
-                result = new Keyframe(time, default(T));
+                result = new Keyframe(time, default);
                 return;
             }
 
diff --git a/Source/Engine/Content/Assets/MaterialInstance.cpp b/Source/Engine/Content/Assets/MaterialInstance.cpp
index 0678f9992..874f607ce 100644
--- a/Source/Engine/Content/Assets/MaterialInstance.cpp
+++ b/Source/Engine/Content/Assets/MaterialInstance.cpp
@@ -23,17 +23,25 @@ void MaterialInstance::OnBaseSet()
     _baseMaterial->OnUnloaded.Bind<MaterialInstance, &MaterialInstance::OnBaseUnloaded>(this);
     _baseMaterial->ParamsChanged.Bind<MaterialInstance, &MaterialInstance::OnBaseParamsChanged>(this);
 
+    // Sync parameters with the base parameters to ensure all data is valid for rendering (constants offset and resource register)
     MaterialParams& baseParams = _baseMaterial->Params;
-    bool validParams = Params.Count() == baseParams.Count();
-    for (int32 i = 0; validParams && i < Params.Count(); i++)
+    Params._versionHash = 0;
+    if (Params.Count() != baseParams.Count())
+    {
+        // Params changed
+        OnBaseParamsChanged();
+        return;
+    }
+    for (int32 i = 0; i < Params.Count(); i++)
     {
         MaterialParameter& param = Params[i];
         MaterialParameter& baseParam = baseParams[i];
 
         if (param.GetID() != baseParam.GetID() || param.GetParameterType() != baseParam.GetParameterType())
         {
-            validParams = false;
-            break;
+            // Params changed
+            OnBaseParamsChanged();
+            return;
         }
 
         param._isPublic = baseParam._isPublic;
@@ -41,21 +49,14 @@ void MaterialInstance::OnBaseSet()
         param._offset = baseParam._offset;
         param._name = baseParam._name;
     }
-    if (validParams)
-    {
-        Params._versionHash = baseParams._versionHash;
-        ParamsChanged();
-    }
-    else
-    {
-        OnBaseParamsChanged();
-    }
+
+    // Params are valid
+    Params._versionHash = baseParams._versionHash;
+    ParamsChanged();
 }
 
 void MaterialInstance::OnBaseUnset()
 {
-    ScopeLock lock(_baseMaterial->Locker);
-
     _baseMaterial->RemoveReference();
     _baseMaterial->OnUnloaded.Unbind<MaterialInstance, &MaterialInstance::OnBaseUnloaded>(this);
     _baseMaterial->ParamsChanged.Unbind<MaterialInstance, &MaterialInstance::OnBaseParamsChanged>(this);
diff --git a/Source/Engine/Core/Collections/OrderedDictionary.cs b/Source/Engine/Core/Collections/OrderedDictionary.cs
index dc427193c..bd62d3451 100644
--- a/Source/Engine/Core/Collections/OrderedDictionary.cs
+++ b/Source/Engine/Core/Collections/OrderedDictionary.cs
@@ -307,7 +307,7 @@ namespace FlaxEngine.Collections
                 return true;
             }
 
-            value = default(TValue);
+            value = default;
             return false;
         }
 
diff --git a/Source/Engine/Core/Math/BoundingBox.cs b/Source/Engine/Core/Math/BoundingBox.cs
index f69e14d3a..784f39930 100644
--- a/Source/Engine/Core/Math/BoundingBox.cs
+++ b/Source/Engine/Core/Math/BoundingBox.cs
@@ -149,8 +149,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public bool Intersects(ref Ray ray)
         {
-            float distance;
-            return CollisionsHelper.RayIntersectsBox(ref ray, ref this, out distance);
+            return CollisionsHelper.RayIntersectsBox(ref ray, ref this, out float _);
         }
 
         /// <summary>
@@ -423,8 +422,7 @@ namespace FlaxEngine
         /// <returns>The result of the transformation.</returns>
         public static BoundingBox Transform(BoundingBox box, Matrix transform)
         {
-            BoundingBox result;
-            Transform(ref box, ref transform, out result);
+            Transform(ref box, ref transform, out BoundingBox result);
             return result;
         }
 
@@ -480,8 +478,7 @@ namespace FlaxEngine
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static BoundingBox operator *(BoundingBox box, Matrix transform)
         {
-            BoundingBox result;
-            Transform(ref box, ref transform, out result);
+            Transform(ref box, ref transform, out BoundingBox result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/BoundingFrustum.cs b/Source/Engine/Core/Math/BoundingFrustum.cs
index be7afff75..14821239d 100644
--- a/Source/Engine/Core/Math/BoundingFrustum.cs
+++ b/Source/Engine/Core/Math/BoundingFrustum.cs
@@ -760,8 +760,7 @@ namespace FlaxEngine
                 for (var i = 0; i < 6; i++)
                 {
                     Plane plane = GetPlane(i);
-                    float distance;
-                    if (CollisionsHelper.RayIntersectsPlane(ref ray, ref plane, out distance) && (distance < nearstPlaneDistance))
+                    if (CollisionsHelper.RayIntersectsPlane(ref ray, ref plane, out float distance) && (distance < nearstPlaneDistance))
                         nearstPlaneDistance = distance;
                 }
 
diff --git a/Source/Engine/Core/Math/BoundingSphere.cs b/Source/Engine/Core/Math/BoundingSphere.cs
index 0a9bc3784..ff0dd7725 100644
--- a/Source/Engine/Core/Math/BoundingSphere.cs
+++ b/Source/Engine/Core/Math/BoundingSphere.cs
@@ -81,8 +81,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public bool Intersects(ref Ray ray)
         {
-            float distance;
-            return CollisionsHelper.RayIntersectsSphere(ref ray, ref this, out distance);
+            return CollisionsHelper.RayIntersectsSphere(ref ray, ref this, out float _);
         }
 
         /// <summary>
@@ -259,8 +258,7 @@ namespace FlaxEngine
             {
                 //We are doing a relative distance comparison to find the maximum distance
                 //from the center of our sphere.
-                float distance;
-                Vector3.DistanceSquared(ref center, ref points[i], out distance);
+                Vector3.DistanceSquared(ref center, ref points[i], out float distance);
 
                 if (distance > radius)
                     radius = distance;
@@ -294,8 +292,7 @@ namespace FlaxEngine
         /// <returns>The newly constructed bounding sphere.</returns>
         public static BoundingSphere FromPoints(Vector3[] points)
         {
-            BoundingSphere result;
-            FromPoints(points, out result);
+            FromPoints(points, out BoundingSphere result);
             return result;
         }
 
@@ -323,8 +320,7 @@ namespace FlaxEngine
         /// <returns>The newly constructed bounding sphere.</returns>
         public static BoundingSphere FromBox(BoundingBox box)
         {
-            BoundingSphere result;
-            FromBox(ref box, out result);
+            FromBox(ref box, out BoundingSphere result);
             return result;
         }
 
@@ -387,8 +383,7 @@ namespace FlaxEngine
         /// <returns>The newly constructed bounding sphere.</returns>
         public static BoundingSphere Merge(BoundingSphere value1, BoundingSphere value2)
         {
-            BoundingSphere result;
-            Merge(ref value1, ref value2, out result);
+            Merge(ref value1, ref value2, out BoundingSphere result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/CollisionsHelper.cs b/Source/Engine/Core/Math/CollisionsHelper.cs
index 22a3846f5..7dd660587 100644
--- a/Source/Engine/Core/Math/CollisionsHelper.cs
+++ b/Source/Engine/Core/Math/CollisionsHelper.cs
@@ -254,8 +254,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 126
 
-            float dot;
-            Vector3.Dot(ref plane.Normal, ref point, out dot);
+            Vector3.Dot(ref plane.Normal, ref point, out float dot);
             float t = dot - plane.D;
 
             result = point - t * plane.Normal;
@@ -272,8 +271,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 130
 
-            Vector3 temp;
-            Vector3.Max(ref point, ref box.Minimum, out temp);
+            Vector3.Max(ref point, ref box.Minimum, out Vector3 temp);
             Vector3.Min(ref temp, ref box.Maximum, out result);
         }
 
@@ -285,9 +283,8 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the closest point between the two objects.</param>
         public static void ClosestPointRectanglePoint(ref Rectangle rect, ref Vector2 point, out Vector2 result)
         {
-            Vector2 temp;
             Vector2 end = rect.Location + rect.Size;
-            Vector2.Max(ref point, ref rect.Location, out temp);
+            Vector2.Max(ref point, ref rect.Location, out Vector2 temp);
             Vector2.Min(ref temp, ref end, out result);
         }
 
@@ -359,8 +356,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 127
 
-            float dot;
-            Vector3.Dot(ref plane.Normal, ref point, out dot);
+            Vector3.Dot(ref plane.Normal, ref point, out float dot);
             return dot - plane.D;
         }
 
@@ -458,8 +454,7 @@ namespace FlaxEngine
             //Source: Jorgy343
             //Reference: None
 
-            float distance;
-            Vector3.Distance(ref sphere.Center, ref point, out distance);
+            Vector3.Distance(ref sphere.Center, ref point, out float distance);
             distance -= sphere.Radius;
 
             return Math.Max(distance, 0f);
@@ -476,8 +471,7 @@ namespace FlaxEngine
             //Source: Jorgy343
             //Reference: None
 
-            float distance;
-            Vector3.Distance(ref sphere1.Center, ref sphere2.Center, out distance);
+            Vector3.Distance(ref sphere1.Center, ref sphere2.Center, out float distance);
             distance -= sphere1.Radius + sphere2.Radius;
 
             return Math.Max(distance, 0f);
@@ -494,8 +488,7 @@ namespace FlaxEngine
             //Source: RayIntersectsSphere
             //Reference: None
 
-            Vector3 m;
-            Vector3.Subtract(ref ray.Position, ref point, out m);
+            Vector3.Subtract(ref ray.Position, ref point, out Vector3 m);
 
             //Same thing as RayIntersectsSphere except that the radius of the sphere (point)
             //is the epsilon for zero.
@@ -538,9 +531,7 @@ namespace FlaxEngine
             //Source: Real-Time Rendering, Third Edition
             //Reference: Page 780
 
-            Vector3 cross;
-
-            Vector3.Cross(ref ray1.Direction, ref ray2.Direction, out cross);
+            Vector3.Cross(ref ray1.Direction, ref ray2.Direction, out Vector3 cross);
             float denominator = cross.Length;
 
             //Lines are parallel.
@@ -553,7 +544,7 @@ namespace FlaxEngine
                     return true;
                 }
 
-            denominator = denominator * denominator;
+            denominator *= denominator;
 
             //3x3 matrix for the first ray.
             float m11 = ray2.Position.X - ray1.Position.X;
@@ -625,8 +616,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 175
 
-            float direction;
-            Vector3.Dot(ref plane.Normal, ref ray.Direction, out direction);
+            Vector3.Dot(ref plane.Normal, ref ray.Direction, out float direction);
 
             if (Mathf.IsZero(direction))
             {
@@ -634,8 +624,7 @@ namespace FlaxEngine
                 return false;
             }
 
-            float position;
-            Vector3.Dot(ref plane.Normal, ref ray.Position, out position);
+            Vector3.Dot(ref plane.Normal, ref ray.Position, out float position);
             distance = (-plane.D - position) / direction;
 
             if (distance < 0f)
@@ -662,8 +651,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 175
 
-            float distance;
-            if (!RayIntersectsPlane(ref ray, ref plane, out distance))
+            if (!RayIntersectsPlane(ref ray, ref plane, out float distance))
             {
                 point = Vector3.Zero;
                 return false;
@@ -796,8 +784,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public static bool RayIntersectsTriangle(ref Ray ray, ref Vector3 vertex1, ref Vector3 vertex2, ref Vector3 vertex3, out Vector3 point)
         {
-            float distance;
-            if (!RayIntersectsTriangle(ref ray, ref vertex1, ref vertex2, ref vertex3, out distance))
+            if (!RayIntersectsTriangle(ref ray, ref vertex1, ref vertex2, ref vertex3, out float distance))
             {
                 point = Vector3.Zero;
                 return false;
@@ -933,8 +920,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public static bool RayIntersectsBox(ref Ray ray, ref BoundingBox box, out Vector3 point)
         {
-            float distance;
-            if (!RayIntersectsBox(ref ray, ref box, out distance))
+            if (!RayIntersectsBox(ref ray, ref box, out float distance))
             {
                 point = Vector3.Zero;
                 return false;
@@ -959,8 +945,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 177
 
-            Vector3 m;
-            Vector3.Subtract(ref ray.Position, ref sphere.Center, out m);
+            Vector3.Subtract(ref ray.Position, ref sphere.Center, out Vector3 m);
 
             float b = Vector3.Dot(m, ray.Direction);
             float c = Vector3.Dot(m, m) - sphere.Radius * sphere.Radius;
@@ -999,8 +984,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public static bool RayIntersectsSphere(ref Ray ray, ref BoundingSphere sphere, out Vector3 point)
         {
-            float distance;
-            if (!RayIntersectsSphere(ref ray, ref sphere, out distance))
+            if (!RayIntersectsSphere(ref ray, ref sphere, out float distance))
             {
                 point = Vector3.Zero;
                 return false;
@@ -1018,8 +1002,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public static PlaneIntersectionType PlaneIntersectsPoint(ref Plane plane, ref Vector3 point)
         {
-            float distance;
-            Vector3.Dot(ref plane.Normal, ref point, out distance);
+            Vector3.Dot(ref plane.Normal, ref point, out float distance);
             distance += plane.D;
 
             if (distance > 0f)
@@ -1039,13 +1022,11 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public static bool PlaneIntersectsPlane(ref Plane plane1, ref Plane plane2)
         {
-            Vector3 direction;
-            Vector3.Cross(ref plane1.Normal, ref plane2.Normal, out direction);
+            Vector3.Cross(ref plane1.Normal, ref plane2.Normal, out Vector3 direction);
 
             //If direction is the zero vector, the planes are parallel and possibly
             //coincident. It is not an intersection. The dot product will tell us.
-            float denominator;
-            Vector3.Dot(ref direction, ref direction, out denominator);
+            Vector3.Dot(ref direction, ref direction, out float denominator);
 
             if (Mathf.IsZero(denominator))
                 return false;
@@ -1073,13 +1054,11 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 207
 
-            Vector3 direction;
-            Vector3.Cross(ref plane1.Normal, ref plane2.Normal, out direction);
+            Vector3.Cross(ref plane1.Normal, ref plane2.Normal, out Vector3 direction);
 
             //If direction is the zero vector, the planes are parallel and possibly
             //coincident. It is not an intersection. The dot product will tell us.
-            float denominator;
-            Vector3.Dot(ref direction, ref direction, out denominator);
+            Vector3.Dot(ref direction, ref direction, out float denominator);
 
             //We assume the planes are normalized, therefore the denominator
             //only serves as a parallel and coincident check. Otherwise we need
@@ -1090,9 +1069,8 @@ namespace FlaxEngine
                 return false;
             }
 
-            Vector3 point;
             Vector3 temp = plane1.D * plane2.Normal - plane2.D * plane1.Normal;
-            Vector3.Cross(ref temp, ref direction, out point);
+            Vector3.Cross(ref temp, ref direction, out Vector3 point);
 
             line.Position = point;
             line.Direction = direction;
@@ -1148,8 +1126,7 @@ namespace FlaxEngine
             min.Y = plane.Normal.Y >= 0.0f ? box.Maximum.Y : box.Minimum.Y;
             min.Z = plane.Normal.Z >= 0.0f ? box.Maximum.Z : box.Minimum.Z;
 
-            float distance;
-            Vector3.Dot(ref plane.Normal, ref max, out distance);
+            Vector3.Dot(ref plane.Normal, ref max, out float distance);
 
             if (distance + plane.D > 0.0f)
                 return PlaneIntersectionType.Front;
@@ -1173,8 +1150,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 160
 
-            float distance;
-            Vector3.Dot(ref plane.Normal, ref sphere.Center, out distance);
+            Vector3.Dot(ref plane.Normal, ref sphere.Center, out float distance);
             distance += plane.D;
 
             if (distance > sphere.Radius)
@@ -1241,8 +1217,7 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 166
 
-            Vector3 vector;
-            Vector3.Clamp(ref sphere.Center, ref box.Minimum, ref box.Maximum, out vector);
+            Vector3.Clamp(ref sphere.Center, ref box.Minimum, ref box.Maximum, out Vector3 vector);
             float distance = Vector3.DistanceSquared(ref sphere.Center, ref vector);
             return distance <= sphere.Radius * sphere.Radius;
         }
@@ -1260,12 +1235,10 @@ namespace FlaxEngine
             //Source: Real-Time Collision Detection by Christer Ericson
             //Reference: Page 167
 
-            Vector3 point;
-            ClosestPointPointTriangle(ref sphere.Center, ref vertex1, ref vertex2, ref vertex3, out point);
+            ClosestPointPointTriangle(ref sphere.Center, ref vertex1, ref vertex2, ref vertex3, out Vector3 point);
             Vector3 v = point - sphere.Center;
 
-            float dot;
-            Vector3.Dot(ref v, ref v, out dot);
+            Vector3.Dot(ref v, ref v, out float dot);
 
             return dot <= sphere.Radius * sphere.Radius;
         }
@@ -1355,8 +1328,7 @@ namespace FlaxEngine
         /// <returns>The type of containment the two objects have.</returns>
         public static ContainmentType BoxContainsSphere(ref BoundingBox box, ref BoundingSphere sphere)
         {
-            Vector3 vector;
-            Vector3.Clamp(ref sphere.Center, ref box.Minimum, ref box.Maximum, out vector);
+            Vector3.Clamp(ref sphere.Center, ref box.Minimum, ref box.Maximum, out Vector3 vector);
             float distance = Vector3.DistanceSquared(ref sphere.Center, ref vector);
 
             if (distance > sphere.Radius * sphere.Radius)
diff --git a/Source/Engine/Core/Math/Color.cs b/Source/Engine/Core/Math/Color.cs
index 96376092e..3a99c8dfd 100644
--- a/Source/Engine/Core/Math/Color.cs
+++ b/Source/Engine/Core/Math/Color.cs
@@ -267,8 +267,7 @@ namespace FlaxEngine
         /// <returns>The color.</returns>
         public static Color ParseHex(string hexString)
         {
-            Color value;
-            if (TryParseHex(hexString, out value))
+            if (TryParseHex(hexString, out Color value))
             {
                 return value;
             }
@@ -744,6 +743,51 @@ namespace FlaxEngine
         }
 
         /// <summary>
+        /// Convert color from the RGB color space to HSV color space.
+        /// </summary>
+        /// <param name="rgbColor">Color of the RGB.</param>
+        /// <param name="h">The output Hue.</param>
+        /// <param name="s">The output Saturation.</param>
+        /// <param name="v">The output Value.</param>
+        public static void RGBToHSV(Color rgbColor, out float h, out float s, out float v)
+        {
+            if ((rgbColor.B > rgbColor.G) && (rgbColor.B > rgbColor.R))
+                RGBToHSVHelper(4f, rgbColor.B, rgbColor.R, rgbColor.G, out h, out s, out v);
+            else if (rgbColor.G <= rgbColor.R)
+                RGBToHSVHelper(0f, rgbColor.R, rgbColor.G, rgbColor.B, out h, out s, out v);
+            else
+                RGBToHSVHelper(2f, rgbColor.G, rgbColor.B, rgbColor.R, out h, out s, out v);
+        }
+
+        private static void RGBToHSVHelper(float offset, float dominantcolor, float colorone, float colortwo, out float h, out float s, out float v)
+        {
+            v = dominantcolor;
+            if (Mathf.IsZero(v))
+            {
+                s = 0f;
+                h = 0f;
+            }
+            else
+            {
+                var single = colorone <= colortwo ? colorone : colortwo;
+                float vv = v - single;
+                if (Mathf.IsZero(vv))
+                {
+                    s = 0f;
+                    h = offset + (colorone - colortwo);
+                }
+                else
+                {
+                    s = vv / v;
+                    h = offset + (colorone - colortwo) / vv;
+                }
+                h /= 6f;
+                if (h < 0f)
+                    h++;
+            }
+        }
+
+        /// <summary>1
         /// Adjusts the contrast of a color.
         /// </summary>
         /// <param name="value">The color whose contrast is to be adjusted.</param>
@@ -901,8 +945,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Color Clamp(Color value, Color min, Color max)
         {
-            Color result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Color result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/HalfUtils.cs b/Source/Engine/Core/Math/HalfUtils.cs
index 7665b5794..c436c69a1 100644
--- a/Source/Engine/Core/Math/HalfUtils.cs
+++ b/Source/Engine/Core/Math/HalfUtils.cs
@@ -52,8 +52,10 @@ namespace FlaxEngine
         /// <returns>The float value</returns>
         public static float Unpack(ushort h)
         {
-            var conv = new FloatToUint();
-            conv.uintValue = HalfToFloatMantissaTable[HalfToFloatOffsetTable[h >> 10] + (((uint)h) & 0x3ff)] + HalfToFloatExponentTable[h >> 10];
+            var conv = new FloatToUint
+            {
+                uintValue = HalfToFloatMantissaTable[HalfToFloatOffsetTable[h >> 10] + (((uint)h) & 0x3ff)] + HalfToFloatExponentTable[h >> 10]
+            };
             return conv.floatValue;
         }
 
@@ -64,8 +66,10 @@ namespace FlaxEngine
         /// <returns>The half value</returns>
         public static ushort Pack(float f)
         {
-            FloatToUint conv = new FloatToUint();
-            conv.floatValue = f;
+            FloatToUint conv = new FloatToUint
+            {
+                floatValue = f
+            };
             return (ushort)(FloatToHalfBaseTable[(conv.uintValue >> 23) & 0x1ff] + ((conv.uintValue & 0x007fffff) >> FloatToHalfShiftTable[(conv.uintValue >> 23) & 0x1ff]));
         }
 
diff --git a/Source/Engine/Core/Math/Int2.cs b/Source/Engine/Core/Math/Int2.cs
index dc492c989..0bf38e95f 100644
--- a/Source/Engine/Core/Math/Int2.cs
+++ b/Source/Engine/Core/Math/Int2.cs
@@ -469,8 +469,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Int2 Clamp(Int2 value, Int2 min, Int2 max)
         {
-            Int2 result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Int2 result);
             return result;
         }
 
@@ -600,8 +599,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the largest components of the source vectors.</returns>
         public static Int2 Max(Int2 left, Int2 right)
         {
-            Int2 result;
-            Max(ref left, ref right, out result);
+            Max(ref left, ref right, out Int2 result);
             return result;
         }
 
@@ -628,8 +626,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the smallest components of the source vectors.</returns>
         public static Int2 Min(Int2 left, Int2 right)
         {
-            Int2 result;
-            Min(ref left, ref right, out result);
+            Min(ref left, ref right, out Int2 result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/Int3.cs b/Source/Engine/Core/Math/Int3.cs
index 432614e40..93193881a 100644
--- a/Source/Engine/Core/Math/Int3.cs
+++ b/Source/Engine/Core/Math/Int3.cs
@@ -519,8 +519,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Int3 Clamp(Int3 value, Int3 min, Int3 max)
         {
-            Int3 result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Int3 result);
             return result;
         }
 
@@ -689,8 +688,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the largest components of the source vectors.</returns>
         public static Int3 Max(Int3 left, Int3 right)
         {
-            Int3 result;
-            Max(ref left, ref right, out result);
+            Max(ref left, ref right, out Int3 result);
             return result;
         }
 
@@ -718,8 +716,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the smallest components of the source vectors.</returns>
         public static Int3 Min(Int3 left, Int3 right)
         {
-            Int3 result;
-            Min(ref left, ref right, out result);
+            Min(ref left, ref right, out Int3 result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/Int4.cs b/Source/Engine/Core/Math/Int4.cs
index 1a09eaebb..0617f7b71 100644
--- a/Source/Engine/Core/Math/Int4.cs
+++ b/Source/Engine/Core/Math/Int4.cs
@@ -504,8 +504,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Int4 Clamp(Int4 value, Int4 min, Int4 max)
         {
-            Int4 result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Int4 result);
             return result;
         }
 
@@ -534,8 +533,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the largest components of the source vectors.</returns>
         public static Int4 Max(Int4 left, Int4 right)
         {
-            Int4 result;
-            Max(ref left, ref right, out result);
+            Max(ref left, ref right, out Int4 result);
             return result;
         }
 
@@ -564,8 +562,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the smallest components of the source vectors.</returns>
         public static Int4 Min(Int4 left, Int4 right)
         {
-            Int4 result;
-            Min(ref left, ref right, out result);
+            Min(ref left, ref right, out Int4 result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/Mathf.cs b/Source/Engine/Core/Math/Mathf.cs
index 529bd6ab0..93e0ff8a4 100644
--- a/Source/Engine/Core/Math/Mathf.cs
+++ b/Source/Engine/Core/Math/Mathf.cs
@@ -154,7 +154,7 @@ namespace FlaxEngine
         {
             float t = Repeat(target - current, 360f);
             if (t > 180f)
-                t = t - 360f;
+                t -= 360f;
             return t;
         }
 
@@ -222,7 +222,7 @@ namespace FlaxEngine
         {
             float c = Repeat(b - a, 360f);
             if (c > 180f)
-                c = c - 360f;
+                c -= 360f;
             return a + c * Saturate(t);
         }
 
diff --git a/Source/Engine/Core/Math/Matrix.cs b/Source/Engine/Core/Math/Matrix.cs
index a6ce7cb22..79f32248a 100644
--- a/Source/Engine/Core/Math/Matrix.cs
+++ b/Source/Engine/Core/Math/Matrix.cs
@@ -695,20 +695,22 @@ namespace FlaxEngine
             Orthonormalize(ref temp, out Q);
             Q.Transpose();
 
-            R = new Matrix();
-            R.M11 = Vector4.Dot(Q.Column1, Column1);
-            R.M12 = Vector4.Dot(Q.Column1, Column2);
-            R.M13 = Vector4.Dot(Q.Column1, Column3);
-            R.M14 = Vector4.Dot(Q.Column1, Column4);
+            R = new Matrix
+            {
+                M11 = Vector4.Dot(Q.Column1, Column1),
+                M12 = Vector4.Dot(Q.Column1, Column2),
+                M13 = Vector4.Dot(Q.Column1, Column3),
+                M14 = Vector4.Dot(Q.Column1, Column4),
 
-            R.M22 = Vector4.Dot(Q.Column2, Column2);
-            R.M23 = Vector4.Dot(Q.Column2, Column3);
-            R.M24 = Vector4.Dot(Q.Column2, Column4);
+                M22 = Vector4.Dot(Q.Column2, Column2),
+                M23 = Vector4.Dot(Q.Column2, Column3),
+                M24 = Vector4.Dot(Q.Column2, Column4),
 
-            R.M33 = Vector4.Dot(Q.Column3, Column3);
-            R.M34 = Vector4.Dot(Q.Column3, Column4);
+                M33 = Vector4.Dot(Q.Column3, Column3),
+                M34 = Vector4.Dot(Q.Column3, Column4),
 
-            R.M44 = Vector4.Dot(Q.Column4, Column4);
+                M44 = Vector4.Dot(Q.Column4, Column4)
+            };
         }
 
         /// <summary>
@@ -720,20 +722,22 @@ namespace FlaxEngine
         {
             Orthonormalize(ref this, out Q);
 
-            L = new Matrix();
-            L.M11 = Vector4.Dot(Q.Row1, Row1);
+            L = new Matrix
+            {
+                M11 = Vector4.Dot(Q.Row1, Row1),
 
-            L.M21 = Vector4.Dot(Q.Row1, Row2);
-            L.M22 = Vector4.Dot(Q.Row2, Row2);
+                M21 = Vector4.Dot(Q.Row1, Row2),
+                M22 = Vector4.Dot(Q.Row2, Row2),
 
-            L.M31 = Vector4.Dot(Q.Row1, Row3);
-            L.M32 = Vector4.Dot(Q.Row2, Row3);
-            L.M33 = Vector4.Dot(Q.Row3, Row3);
+                M31 = Vector4.Dot(Q.Row1, Row3),
+                M32 = Vector4.Dot(Q.Row2, Row3),
+                M33 = Vector4.Dot(Q.Row3, Row3),
 
-            L.M41 = Vector4.Dot(Q.Row1, Row4);
-            L.M42 = Vector4.Dot(Q.Row2, Row4);
-            L.M43 = Vector4.Dot(Q.Row3, Row4);
-            L.M44 = Vector4.Dot(Q.Row4, Row4);
+                M41 = Vector4.Dot(Q.Row1, Row4),
+                M42 = Vector4.Dot(Q.Row2, Row4),
+                M43 = Vector4.Dot(Q.Row3, Row4),
+                M44 = Vector4.Dot(Q.Row4, Row4)
+            };
         }
 
         /// <summary>
@@ -1205,7 +1209,7 @@ namespace FlaxEngine
             while (true)
             {
                 if ((exponent & 1) != 0)
-                    identity = identity * temp;
+                    identity *= temp;
 
                 exponent /= 2;
 
@@ -1517,14 +1521,14 @@ namespace FlaxEngine
             //By separating the above algorithm into multiple lines, we actually increase accuracy.
             result = value;
 
-            result.Row2 = result.Row2 - Vector4.Dot(result.Row1, result.Row2) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
+            result.Row2 -= Vector4.Dot(result.Row1, result.Row2) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
 
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row1, result.Row3) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row2, result.Row3) / Vector4.Dot(result.Row2, result.Row2) * result.Row2;
+            result.Row3 -= Vector4.Dot(result.Row1, result.Row3) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
+            result.Row3 -= Vector4.Dot(result.Row2, result.Row3) / Vector4.Dot(result.Row2, result.Row2) * result.Row2;
 
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row1, result.Row4) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row2, result.Row4) / Vector4.Dot(result.Row2, result.Row2) * result.Row2;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row3, result.Row4) / Vector4.Dot(result.Row3, result.Row3) * result.Row3;
+            result.Row4 -= Vector4.Dot(result.Row1, result.Row4) / Vector4.Dot(result.Row1, result.Row1) * result.Row1;
+            result.Row4 -= Vector4.Dot(result.Row2, result.Row4) / Vector4.Dot(result.Row2, result.Row2) * result.Row2;
+            result.Row4 -= Vector4.Dot(result.Row3, result.Row4) / Vector4.Dot(result.Row3, result.Row3) * result.Row3;
         }
 
         /// <summary>
@@ -1594,16 +1598,16 @@ namespace FlaxEngine
 
             result.Row1 = Vector4.Normalize(result.Row1);
 
-            result.Row2 = result.Row2 - Vector4.Dot(result.Row1, result.Row2) * result.Row1;
+            result.Row2 -= Vector4.Dot(result.Row1, result.Row2) * result.Row1;
             result.Row2 = Vector4.Normalize(result.Row2);
 
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row1, result.Row3) * result.Row1;
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row2, result.Row3) * result.Row2;
+            result.Row3 -= Vector4.Dot(result.Row1, result.Row3) * result.Row1;
+            result.Row3 -= Vector4.Dot(result.Row2, result.Row3) * result.Row2;
             result.Row3 = Vector4.Normalize(result.Row3);
 
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row1, result.Row4) * result.Row1;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row2, result.Row4) * result.Row2;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row3, result.Row4) * result.Row3;
+            result.Row4 -= Vector4.Dot(result.Row1, result.Row4) * result.Row1;
+            result.Row4 -= Vector4.Dot(result.Row2, result.Row4) * result.Row2;
+            result.Row4 -= Vector4.Dot(result.Row3, result.Row4) * result.Row3;
             result.Row4 = Vector4.Normalize(result.Row4);
         }
 
diff --git a/Source/Engine/Core/Math/Matrix3x3.cs b/Source/Engine/Core/Math/Matrix3x3.cs
index 4ef12383e..f440eb799 100644
--- a/Source/Engine/Core/Math/Matrix3x3.cs
+++ b/Source/Engine/Core/Math/Matrix3x3.cs
@@ -697,8 +697,7 @@ namespace FlaxEngine
         /// <returns>The sum of the two matrices.</returns>
         public static Matrix3x3 Add(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Add(ref left, ref right, out result);
+            Add(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -729,8 +728,7 @@ namespace FlaxEngine
         /// <returns>The difference between the two matrices.</returns>
         public static Matrix3x3 Subtract(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Subtract(ref left, ref right, out result);
+            Subtract(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -761,8 +759,7 @@ namespace FlaxEngine
         /// <returns>The scaled Matrix3x3.</returns>
         public static Matrix3x3 Multiply(Matrix3x3 left, float right)
         {
-            Matrix3x3 result;
-            Multiply(ref left, right, out result);
+            Multiply(ref left, right, out Matrix3x3 result);
             return result;
         }
 
@@ -797,8 +794,7 @@ namespace FlaxEngine
         /// <returns>The product of the two matrices.</returns>
         public static Matrix3x3 Multiply(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Multiply(ref left, ref right, out result);
+            Multiply(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -831,8 +827,7 @@ namespace FlaxEngine
         /// <returns>The scaled Matrix3x3.</returns>
         public static Matrix3x3 Divide(Matrix3x3 left, float right)
         {
-            Matrix3x3 result;
-            Divide(ref left, right, out result);
+            Divide(ref left, right, out Matrix3x3 result);
             return result;
         }
 
@@ -863,8 +858,7 @@ namespace FlaxEngine
         /// <returns>The quotient of the two matrices.</returns>
         public static Matrix3x3 Divide(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Divide(ref left, ref right, out result);
+            Divide(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -901,7 +895,7 @@ namespace FlaxEngine
             while (true)
             {
                 if ((exponent & 1) != 0)
-                    identity = identity * temp;
+                    identity *= temp;
 
                 exponent /= 2;
 
@@ -923,8 +917,7 @@ namespace FlaxEngine
         /// <exception cref="System.ArgumentOutOfRangeException">Thrown when the <paramref name="exponent"/> is negative.</exception>
         public static Matrix3x3 Exponent(Matrix3x3 value, int exponent)
         {
-            Matrix3x3 result;
-            Exponent(ref value, exponent, out result);
+            Exponent(ref value, exponent, out Matrix3x3 result);
             return result;
         }
 
@@ -953,8 +946,7 @@ namespace FlaxEngine
         /// <returns>The negated Matrix3x3.</returns>
         public static Matrix3x3 Negate(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            Negate(ref value, out result);
+            Negate(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -993,8 +985,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Matrix3x3 Lerp(Matrix3x3 start, Matrix3x3 end, float amount)
         {
-            Matrix3x3 result;
-            Lerp(ref start, ref end, amount, out result);
+            Lerp(ref start, ref end, amount, out Matrix3x3 result);
             return result;
         }
 
@@ -1020,8 +1011,7 @@ namespace FlaxEngine
         /// <returns>The cubic interpolation of the two matrices.</returns>
         public static Matrix3x3 SmoothStep(Matrix3x3 start, Matrix3x3 end, float amount)
         {
-            Matrix3x3 result;
-            SmoothStep(ref start, ref end, amount, out result);
+            SmoothStep(ref start, ref end, amount, out Matrix3x3 result);
             return result;
         }
 
@@ -1073,8 +1063,7 @@ namespace FlaxEngine
         /// <returns>The transpose of the specified Matrix3x3.</returns>
         public static Matrix3x3 Transpose(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            Transpose(ref value, out result);
+            Transpose(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1154,10 +1143,10 @@ namespace FlaxEngine
             //By separating the above algorithm into multiple lines, we actually increase accuracy.
             result = value;
 
-            result.Row2 = result.Row2 - (Vector3.Dot(result.Row1, result.Row2) / Vector3.Dot(result.Row1, result.Row1)) * result.Row1;
+            result.Row2 -= (Vector3.Dot(result.Row1, result.Row2) / Vector3.Dot(result.Row1, result.Row1)) * result.Row1;
 
-            result.Row3 = result.Row3 - (Vector3.Dot(result.Row1, result.Row3) / Vector3.Dot(result.Row1, result.Row1)) * result.Row1;
-            result.Row3 = result.Row3 - (Vector3.Dot(result.Row2, result.Row3) / Vector3.Dot(result.Row2, result.Row2)) * result.Row2;
+            result.Row3 -= (Vector3.Dot(result.Row1, result.Row3) / Vector3.Dot(result.Row1, result.Row1)) * result.Row1;
+            result.Row3 -= (Vector3.Dot(result.Row2, result.Row3) / Vector3.Dot(result.Row2, result.Row2)) * result.Row2;
         }
 
         /// <summary>
@@ -1178,8 +1167,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Matrix3x3 Orthogonalize(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            Orthogonalize(ref value, out result);
+            Orthogonalize(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1215,11 +1203,11 @@ namespace FlaxEngine
 
             result.Row1 = Vector3.Normalize(result.Row1);
 
-            result.Row2 = result.Row2 - Vector3.Dot(result.Row1, result.Row2) * result.Row1;
+            result.Row2 -= Vector3.Dot(result.Row1, result.Row2) * result.Row1;
             result.Row2 = Vector3.Normalize(result.Row2);
 
-            result.Row3 = result.Row3 - Vector3.Dot(result.Row1, result.Row3) * result.Row1;
-            result.Row3 = result.Row3 - Vector3.Dot(result.Row2, result.Row3) * result.Row2;
+            result.Row3 -= Vector3.Dot(result.Row1, result.Row3) * result.Row1;
+            result.Row3 -= Vector3.Dot(result.Row2, result.Row3) * result.Row2;
             result.Row3 = Vector3.Normalize(result.Row3);
         }
 
@@ -1243,8 +1231,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Matrix3x3 Orthonormalize(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            Orthonormalize(ref value, out result);
+            Orthonormalize(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1322,8 +1309,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Matrix3x3 UpperTriangularForm(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            UpperTriangularForm(ref value, out result);
+            UpperTriangularForm(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1405,8 +1391,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Matrix3x3 LowerTriangularForm(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            LowerTriangularForm(ref value, out result);
+            LowerTriangularForm(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1477,8 +1462,7 @@ namespace FlaxEngine
         /// <returns>When the method completes, contains the row echelon form of the Matrix3x3.</returns>
         public static Matrix3x3 RowEchelonForm(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            RowEchelonForm(ref value, out result);
+            RowEchelonForm(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1492,8 +1476,6 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the created billboard Matrix3x3.</param>
         public static void Billboard(ref Vector3 objectPosition, ref Vector3 cameraPosition, ref Vector3 cameraUpVector, ref Vector3 cameraForwardVector, out Matrix3x3 result)
         {
-            Vector3 crossed;
-            Vector3 final;
             Vector3 difference = cameraPosition - objectPosition;
 
             float lengthSq = difference.LengthSquared;
@@ -1502,9 +1484,9 @@ namespace FlaxEngine
             else
                 difference *= (float)(1.0 / Math.Sqrt(lengthSq));
 
-            Vector3.Cross(ref cameraUpVector, ref difference, out crossed);
+            Vector3.Cross(ref cameraUpVector, ref difference, out Vector3 crossed);
             crossed.Normalize();
-            Vector3.Cross(ref difference, ref crossed, out final);
+            Vector3.Cross(ref difference, ref crossed, out Vector3 final);
 
             result.M11 = crossed.X;
             result.M12 = crossed.Y;
@@ -1527,8 +1509,7 @@ namespace FlaxEngine
         /// <returns>The created billboard Matrix3x3.</returns>
         public static Matrix3x3 Billboard(Vector3 objectPosition, Vector3 cameraPosition, Vector3 cameraUpVector, Vector3 cameraForwardVector)
         {
-            Matrix3x3 result;
-            Billboard(ref objectPosition, ref cameraPosition, ref cameraUpVector, ref cameraForwardVector, out result);
+            Billboard(ref objectPosition, ref cameraPosition, ref cameraUpVector, ref cameraForwardVector, out Matrix3x3 result);
             return result;
         }
 
@@ -1541,12 +1522,13 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the created look-at Matrix3x3.</param>
         public static void LookAt(ref Vector3 eye, ref Vector3 target, ref Vector3 up, out Matrix3x3 result)
         {
-            Vector3 xaxis, yaxis, zaxis;
-            Vector3.Subtract(ref target, ref eye, out zaxis);
+            Vector3.Subtract(ref target, ref eye, out Vector3 zaxis);
             zaxis.Normalize();
-            Vector3.Cross(ref up, ref zaxis, out xaxis);
+
+            Vector3.Cross(ref up, ref zaxis, out Vector3 xaxis);
             xaxis.Normalize();
-            Vector3.Cross(ref zaxis, ref xaxis, out yaxis);
+
+            Vector3.Cross(ref zaxis, ref xaxis, out Vector3 yaxis);
 
             result = Identity;
             result.M11 = xaxis.X;
@@ -1569,8 +1551,7 @@ namespace FlaxEngine
         /// <returns>The created look-at Matrix3x3.</returns>
         public static Matrix3x3 LookAt(Vector3 eye, Vector3 target, Vector3 up)
         {
-            Matrix3x3 result;
-            LookAt(ref eye, ref target, ref up, out result);
+            LookAt(ref eye, ref target, ref up, out Matrix3x3 result);
             return result;
         }
 
@@ -1591,8 +1572,7 @@ namespace FlaxEngine
         /// <returns>The created scaling Matrix3x3.</returns>
         public static Matrix3x3 Scaling(Vector3 scale)
         {
-            Matrix3x3 result;
-            Scaling(ref scale, out result);
+            Scaling(ref scale, out Matrix3x3 result);
             return result;
         }
 
@@ -1620,8 +1600,7 @@ namespace FlaxEngine
         /// <returns>The created scaling Matrix3x3.</returns>
         public static Matrix3x3 Scaling(float x, float y, float z)
         {
-            Matrix3x3 result;
-            Scaling(x, y, z, out result);
+            Scaling(x, y, z, out Matrix3x3 result);
             return result;
         }
 
@@ -1643,8 +1622,7 @@ namespace FlaxEngine
         /// <returns>The created scaling Matrix3x3.</returns>
         public static Matrix3x3 Scaling(float scale)
         {
-            Matrix3x3 result;
-            Scaling(scale, out result);
+            Scaling(scale, out Matrix3x3 result);
             return result;
         }
 
@@ -1690,8 +1668,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationX(float angle)
         {
-            Matrix3x3 result;
-            RotationX(angle, out result);
+            RotationX(angle, out Matrix3x3 result);
             return result;
         }
 
@@ -1702,8 +1679,8 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the created rotation Matrix3x3.</param>
         public static void RotationY(float angle, out Matrix3x3 result)
         {
-            float cos = (float)Math.Cos(angle);
-            float sin = (float)Math.Sin(angle);
+            float cos = Mathf.Cos(angle);
+            float sin = Mathf.Sin(angle);
 
             result = Identity;
             result.M11 = cos;
@@ -1719,8 +1696,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationY(float angle)
         {
-            Matrix3x3 result;
-            RotationY(angle, out result);
+            RotationY(angle, out Matrix3x3 result);
             return result;
         }
 
@@ -1731,8 +1707,8 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the created rotation Matrix3x3.</param>
         public static void RotationZ(float angle, out Matrix3x3 result)
         {
-            float cos = (float)Math.Cos(angle);
-            float sin = (float)Math.Sin(angle);
+            float cos = Mathf.Cos(angle);
+            float sin = Mathf.Sin(angle);
 
             result = Identity;
             result.M11 = cos;
@@ -1748,8 +1724,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationZ(float angle)
         {
-            Matrix3x3 result;
-            RotationZ(angle, out result);
+            RotationZ(angle, out Matrix3x3 result);
             return result;
         }
 
@@ -1793,8 +1768,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationAxis(Vector3 axis, float angle)
         {
-            Matrix3x3 result;
-            RotationAxis(ref axis, angle, out result);
+            RotationAxis(ref axis, angle, out Matrix3x3 result);
             return result;
         }
 
@@ -1834,8 +1808,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationQuaternion(Quaternion rotation)
         {
-            Matrix3x3 result;
-            RotationQuaternion(ref rotation, out result);
+            RotationQuaternion(ref rotation, out Matrix3x3 result);
             return result;
         }
 
@@ -1848,8 +1821,7 @@ namespace FlaxEngine
         /// <param name="result">When the method completes, contains the created rotation Matrix3x3.</param>
         public static void RotationYawPitchRoll(float yaw, float pitch, float roll, out Matrix3x3 result)
         {
-            Quaternion quaternion;
-            Quaternion.RotationYawPitchRoll(yaw, pitch, roll, out quaternion);
+            Quaternion.RotationYawPitchRoll(yaw, pitch, roll, out Quaternion quaternion);
             RotationQuaternion(ref quaternion, out result);
         }
 
@@ -1862,8 +1834,7 @@ namespace FlaxEngine
         /// <returns>The created rotation Matrix3x3.</returns>
         public static Matrix3x3 RotationYawPitchRoll(float yaw, float pitch, float roll)
         {
-            Matrix3x3 result;
-            RotationYawPitchRoll(yaw, pitch, roll, out result);
+            RotationYawPitchRoll(yaw, pitch, roll, out Matrix3x3 result);
             return result;
         }
 
@@ -1931,8 +1902,7 @@ namespace FlaxEngine
         /// <returns>The result.</returns>
         public static Vector2 Transform2D(Vector2 vector, Matrix3x3 transform)
         {
-            Vector2 result;
-            Transform2D(ref vector, ref transform, out result);
+            Transform2D(ref vector, ref transform, out Vector2 result);
             return result;
         }
 
@@ -1944,8 +1914,7 @@ namespace FlaxEngine
         /// <returns>The sum of the two matrices.</returns>
         public static Matrix3x3 operator +(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Add(ref left, ref right, out result);
+            Add(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -1967,8 +1936,7 @@ namespace FlaxEngine
         /// <returns>The difference between the two matrices.</returns>
         public static Matrix3x3 operator -(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Subtract(ref left, ref right, out result);
+            Subtract(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -1979,8 +1947,7 @@ namespace FlaxEngine
         /// <returns>The negated Matrix3x3.</returns>
         public static Matrix3x3 operator -(Matrix3x3 value)
         {
-            Matrix3x3 result;
-            Negate(ref value, out result);
+            Negate(ref value, out Matrix3x3 result);
             return result;
         }
 
@@ -1992,8 +1959,7 @@ namespace FlaxEngine
         /// <returns>The scaled Matrix3x3.</returns>
         public static Matrix3x3 operator *(float left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Multiply(ref right, left, out result);
+            Multiply(ref right, left, out Matrix3x3 result);
             return result;
         }
 
@@ -2005,8 +1971,7 @@ namespace FlaxEngine
         /// <returns>The scaled Matrix3x3.</returns>
         public static Matrix3x3 operator *(Matrix3x3 left, float right)
         {
-            Matrix3x3 result;
-            Multiply(ref left, right, out result);
+            Multiply(ref left, right, out Matrix3x3 result);
             return result;
         }
 
@@ -2018,8 +1983,7 @@ namespace FlaxEngine
         /// <returns>The product of the two matrices.</returns>
         public static Matrix3x3 operator *(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Multiply(ref left, ref right, out result);
+            Multiply(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
@@ -2031,8 +1995,7 @@ namespace FlaxEngine
         /// <returns>The scaled Matrix3x3.</returns>
         public static Matrix3x3 operator /(Matrix3x3 left, float right)
         {
-            Matrix3x3 result;
-            Divide(ref left, right, out result);
+            Divide(ref left, right, out Matrix3x3 result);
             return result;
         }
 
@@ -2044,8 +2007,7 @@ namespace FlaxEngine
         /// <returns>The quotient of the two matrices.</returns>
         public static Matrix3x3 operator /(Matrix3x3 left, Matrix3x3 right)
         {
-            Matrix3x3 result;
-            Divide(ref left, ref right, out result);
+            Divide(ref left, ref right, out Matrix3x3 result);
             return result;
         }
 
diff --git a/Source/Engine/Core/Math/OrientedBoundingBox.cs b/Source/Engine/Core/Math/OrientedBoundingBox.cs
index 4e44746e7..d37255c1b 100644
--- a/Source/Engine/Core/Math/OrientedBoundingBox.cs
+++ b/Source/Engine/Core/Math/OrientedBoundingBox.cs
@@ -361,11 +361,9 @@ namespace FlaxEngine
         public ContainmentType Contains(ref Vector3 point)
         {
             // Transform the point into the obb coordinates
-            Matrix invTrans;
-            Matrix.Invert(ref Transformation, out invTrans);
+            Matrix.Invert(ref Transformation, out Matrix invTrans);
 
-            Vector3 locPoint;
-            Vector3.TransformCoordinate(ref point, ref invTrans, out locPoint);
+            Vector3.TransformCoordinate(ref point, ref invTrans, out Vector3 locPoint);
 
             locPoint.X = Math.Abs(locPoint.X);
             locPoint.Y = Math.Abs(locPoint.Y);
@@ -396,16 +394,14 @@ namespace FlaxEngine
         /// <returns>The type of containment.</returns>
         public ContainmentType Contains(Vector3[] points)
         {
-            Matrix invTrans;
-            Matrix.Invert(ref Transformation, out invTrans);
+            Matrix.Invert(ref Transformation, out Matrix invTrans);
 
             var containsAll = true;
             var containsAny = false;
 
             for (var i = 0; i < points.Length; i++)
             {
-                Vector3 locPoint;
-                Vector3.TransformCoordinate(ref points[i], ref invTrans, out locPoint);
+                Vector3.TransformCoordinate(ref points[i], ref invTrans, out Vector3 locPoint);
 
                 locPoint.X = Math.Abs(locPoint.X);
                 locPoint.Y = Math.Abs(locPoint.Y);
@@ -416,6 +412,7 @@ namespace FlaxEngine
                     Mathf.NearEqual(locPoint.Y, Extents.Y) &&
                     Mathf.NearEqual(locPoint.Z, Extents.Z))
                     containsAny = true;
+
                 if ((locPoint.X < Extents.X) && (locPoint.Y < Extents.Y) && (locPoint.Z < Extents.Z))
                     containsAny = true;
                 else
@@ -424,8 +421,10 @@ namespace FlaxEngine
 
             if (containsAll)
                 return ContainmentType.Contains;
+
             if (containsAny)
                 return ContainmentType.Intersects;
+
             return ContainmentType.Disjoint;
         }
 
@@ -445,12 +444,10 @@ namespace FlaxEngine
         /// </remarks>
         public ContainmentType Contains(BoundingSphere sphere, bool ignoreScale = false)
         {
-            Matrix invTrans;
-            Matrix.Invert(ref Transformation, out invTrans);
+            Matrix.Invert(ref Transformation, out Matrix invTrans);
 
             // Transform sphere center into the obb coordinates
-            Vector3 locCenter;
-            Vector3.TransformCoordinate(ref sphere.Center, ref invTrans, out locCenter);
+            Vector3.TransformCoordinate(ref sphere.Center, ref invTrans, out Vector3 locCenter);
 
             float locRadius;
             if (ignoreScale)
@@ -465,8 +462,7 @@ namespace FlaxEngine
 
             //Perform regular BoundingBox to BoundingSphere containment check
             Vector3 minusExtens = -Extents;
-            Vector3 vector;
-            Vector3.Clamp(ref locCenter, ref minusExtens, ref Extents, out vector);
+            Vector3.Clamp(ref locCenter, ref minusExtens, ref Extents, out Vector3 vector);
             float distance = Vector3.DistanceSquared(ref locCenter, ref vector);
 
             if (distance > locRadius * locRadius)
@@ -591,13 +587,10 @@ namespace FlaxEngine
 
             //http://www.3dkingdoms.com/weekly/bbox.cpp
             // Put line in box space
-            Matrix invTrans;
-            Matrix.Invert(ref Transformation, out invTrans);
+            Matrix.Invert(ref Transformation, out Matrix invTrans);
 
-            Vector3 LB1;
-            Vector3.TransformCoordinate(ref L1, ref invTrans, out LB1);
-            Vector3 LB2;
-            Vector3.TransformCoordinate(ref L1, ref invTrans, out LB2);
+            Vector3.TransformCoordinate(ref L1, ref invTrans, out Vector3 LB1);
+            Vector3.TransformCoordinate(ref L1, ref invTrans, out Vector3 LB2);
 
             // Get line midpoint and extent
             Vector3 LMid = (LB1 + LB2) * 0.5f;
@@ -608,17 +601,23 @@ namespace FlaxEngine
             // Separation vector from box center to line center is LMid, since the line is in box space
             if (Math.Abs(LMid.X) > Extents.X + LExt.X)
                 return ContainmentType.Disjoint;
+
             if (Math.Abs(LMid.Y) > Extents.Y + LExt.Y)
                 return ContainmentType.Disjoint;
+
             if (Math.Abs(LMid.Z) > Extents.Z + LExt.Z)
                 return ContainmentType.Disjoint;
+
             // Cross products of line and each axis
             if (Math.Abs(LMid.Y * L.Z - LMid.Z * L.Y) > Extents.Y * LExt.Z + Extents.Z * LExt.Y)
                 return ContainmentType.Disjoint;
+
             if (Math.Abs(LMid.X * L.Z - LMid.Z * L.X) > Extents.X * LExt.Z + Extents.Z * LExt.X)
                 return ContainmentType.Disjoint;
+
             if (Math.Abs(LMid.X * L.Y - LMid.Y * L.X) > Extents.X * LExt.Y + Extents.Y * LExt.X)
                 return ContainmentType.Disjoint;
+
             // No separating axis, the line intersects
             return ContainmentType.Intersects;
         }
@@ -649,8 +648,8 @@ namespace FlaxEngine
             float ExtentA, ExtentB, Separation;
             int i, k;
 
-            Matrix R; // Rotation from B to A
-            Matrix.Invert(ref Transformation, out R);
+            // Rotation from B to A
+            Matrix.Invert(ref Transformation, out Matrix R);
             var AR = new Matrix(); // absolute values of R matrix, to use with box extents
 
             for (i = 0; i < 3; i++)
@@ -713,8 +712,7 @@ namespace FlaxEngine
         public bool Intersects(ref Ray ray, out Vector3 point)
         {
             // Put ray in box space
-            Matrix invTrans;
-            Matrix.Invert(ref Transformation, out invTrans);
+            Matrix.Invert(ref Transformation, out Matrix invTrans);
 
             Ray bRay;
             Vector3.TransformNormal(ref ray.Direction, ref invTrans, out bRay.Direction);
@@ -742,8 +740,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public bool Intersects(ref Ray ray, out float distance)
         {
-            Vector3 point;
-            if (Intersects(ref ray, out point))
+            if (Intersects(ref ray, out Vector3 point))
             {
                 Vector3.Distance(ref ray.Position, ref point, out distance);
                 return true;
@@ -759,8 +756,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public bool Intersects(ref Ray ray)
         {
-            Vector3 point;
-            return Intersects(ref ray, out point);
+            return Intersects(ref ray, out Vector3 _);
         }
 
         private Vector3[] GetLocalCorners()
@@ -824,8 +820,7 @@ namespace FlaxEngine
             }
             else
             {
-                Matrix AInvMat;
-                Matrix.Invert(ref A.Transformation, out AInvMat);
+                Matrix.Invert(ref A.Transformation, out Matrix AInvMat);
                 AtoB_Matrix = B.Transformation * AInvMat;
             }
 
@@ -861,8 +856,7 @@ namespace FlaxEngine
             BoundingBox B_LocalBB = BoundingBox.FromPoints(bCorners);
 
             //Merger A and B local Bounding Boxes
-            BoundingBox mergedBB;
-            BoundingBox.Merge(ref B_LocalBB, ref A_LocalBB, out mergedBB);
+            BoundingBox.Merge(ref B_LocalBB, ref A_LocalBB, out BoundingBox mergedBB);
 
             //Find the new Extents and Center, Transform Center back to world
             Vector3 newCenter = mergedBB.Minimum + (mergedBB.Maximum - mergedBB.Minimum) / 2f;
diff --git a/Source/Engine/Core/Math/Plane.cs b/Source/Engine/Core/Math/Plane.cs
index d37516fba..79bf86bd8 100644
--- a/Source/Engine/Core/Math/Plane.cs
+++ b/Source/Engine/Core/Math/Plane.cs
@@ -254,8 +254,7 @@ namespace FlaxEngine
         /// <returns>Whether the two objects intersected.</returns>
         public bool Intersects(ref Ray ray)
         {
-            float distance;
-            return CollisionsHelper.RayIntersectsPlane(ref ray, ref this, out distance);
+            return CollisionsHelper.RayIntersectsPlane(ref ray, ref this, out float _);
         }
 
         /// <summary>
@@ -379,8 +378,7 @@ namespace FlaxEngine
         /// <returns>The reflection matrix.</returns>
         public Matrix Reflection()
         {
-            Matrix result;
-            Reflection(out result);
+            Reflection(out Matrix result);
             return result;
         }
 
@@ -432,8 +430,7 @@ namespace FlaxEngine
         /// <returns>The shadow matrix.</returns>
         public Matrix Shadow(Vector4 light)
         {
-            Matrix result;
-            Shadow(ref light, out result);
+            Shadow(ref light, out Matrix result);
             return result;
         }
 
@@ -469,8 +466,7 @@ namespace FlaxEngine
         /// <returns>The reflection Matrix3x3.</returns>
         public Matrix3x3 Reflection3x3()
         {
-            Matrix3x3 result;
-            Reflection(out result);
+            Reflection(out Matrix3x3 result);
             return result;
         }
 
@@ -492,7 +488,6 @@ namespace FlaxEngine
             float x = -plane.Normal.X;
             float y = -plane.Normal.Y;
             float z = -plane.Normal.Z;
-            float d = -plane.D;
 
             result.M11 = x * light.X + dot;
             result.M21 = y * light.X;
@@ -519,8 +514,7 @@ namespace FlaxEngine
         /// <returns>The shadow Matrix3x3.</returns>
         public static Matrix3x3 Shadow(Vector4 light, Plane plane)
         {
-            Matrix3x3 result;
-            Shadow(ref light, ref plane, out result);
+            Shadow(ref light, ref plane, out Matrix3x3 result);
             return result;
         }
 
@@ -765,8 +759,7 @@ namespace FlaxEngine
             float z = plane.Normal.Z;
             float d = plane.D;
 
-            Matrix inverse;
-            Matrix.Invert(ref transformation, out inverse);
+            Matrix.Invert(ref transformation, out Matrix inverse);
 
             result.Normal.X = x * inverse.M11 + y * inverse.M12 + z * inverse.M13 + d * inverse.M14;
             result.Normal.Y = x * inverse.M21 + y * inverse.M22 + z * inverse.M23 + d * inverse.M24;
@@ -808,8 +801,7 @@ namespace FlaxEngine
             if (planes == null)
                 throw new ArgumentNullException(nameof(planes));
 
-            Matrix inverse;
-            Matrix.Invert(ref transformation, out inverse);
+            Matrix.Invert(ref transformation, out _);
 
             for (var i = 0; i < planes.Length; ++i)
                 Transform(ref planes[i], ref transformation, out planes[i]);
diff --git a/Source/Engine/Core/Math/Quaternion.cs b/Source/Engine/Core/Math/Quaternion.cs
index 938bf48b1..f3bc66f76 100644
--- a/Source/Engine/Core/Math/Quaternion.cs
+++ b/Source/Engine/Core/Math/Quaternion.cs
@@ -345,7 +345,7 @@ namespace FlaxEngine
                 X = -X * lengthSq;
                 Y = -Y * lengthSq;
                 Z = -Z * lengthSq;
-                W = W * lengthSq;
+                W *= lengthSq;
             }
         }
 
diff --git a/Source/Engine/Core/Math/Vector2.cs b/Source/Engine/Core/Math/Vector2.cs
index 768007180..329253535 100644
--- a/Source/Engine/Core/Math/Vector2.cs
+++ b/Source/Engine/Core/Math/Vector2.cs
@@ -540,8 +540,7 @@ namespace FlaxEngine
         /// <returns>A new <see cref="Vector2" /> containing the 2D Cartesian coordinates of the specified point.</returns>
         public static Vector2 Barycentric(Vector2 value1, Vector2 value2, Vector2 value3, float amount1, float amount2)
         {
-            Vector2 result;
-            Barycentric(ref value1, ref value2, ref value3, amount1, amount2, out result);
+            Barycentric(ref value1, ref value2, ref value3, amount1, amount2, out Vector2 result);
             return result;
         }
 
@@ -574,8 +573,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Vector2 Clamp(Vector2 value, Vector2 min, Vector2 max)
         {
-            Vector2 result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Vector2 result);
             return result;
         }
 
@@ -895,8 +893,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector2 Lerp(Vector2 start, Vector2 end, float amount)
         {
-            Vector2 result;
-            Lerp(ref start, ref end, amount, out result);
+            Lerp(ref start, ref end, amount, out Vector2 result);
             return result;
         }
 
@@ -930,8 +927,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector2 Lerp(Vector2 start, Vector2 end, Vector2 amount)
         {
-            Vector2 result;
-            Lerp(ref start, ref end, ref amount, out result);
+            Lerp(ref start, ref end, ref amount, out Vector2 result);
             return result;
         }
 
@@ -957,8 +953,7 @@ namespace FlaxEngine
         /// <returns>The cubic interpolation of the two vectors.</returns>
         public static Vector2 SmoothStep(Vector2 start, Vector2 end, float amount)
         {
-            Vector2 result;
-            SmoothStep(ref start, ref end, amount, out result);
+            SmoothStep(ref start, ref end, amount, out Vector2 result);
             return result;
         }
 
@@ -995,8 +990,7 @@ namespace FlaxEngine
         /// <returns>The result of the Hermite spline interpolation.</returns>
         public static Vector2 Hermite(Vector2 value1, Vector2 tangent1, Vector2 value2, Vector2 tangent2, float amount)
         {
-            Vector2 result;
-            Hermite(ref value1, ref tangent1, ref value2, ref tangent2, amount, out result);
+            Hermite(ref value1, ref tangent1, ref value2, ref tangent2, amount, out Vector2 result);
             return result;
         }
 
@@ -1054,8 +1048,7 @@ namespace FlaxEngine
         /// <returns>A vector that is the result of the Catmull-Rom interpolation.</returns>
         public static Vector2 CatmullRom(Vector2 value1, Vector2 value2, Vector2 value3, Vector2 value4, float amount)
         {
-            Vector2 result;
-            CatmullRom(ref value1, ref value2, ref value3, ref value4, amount, out result);
+            CatmullRom(ref value1, ref value2, ref value3, ref value4, amount, out Vector2 result);
             return result;
         }
 
@@ -1082,8 +1075,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the largest components of the source vectors.</returns>
         public static Vector2 Max(Vector2 left, Vector2 right)
         {
-            Vector2 result;
-            Max(ref left, ref right, out result);
+            Max(ref left, ref right, out Vector2 result);
             return result;
         }
 
@@ -1110,8 +1102,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the smallest components of the source vectors.</returns>
         public static Vector2 Min(Vector2 left, Vector2 right)
         {
-            Vector2 result;
-            Min(ref left, ref right, out result);
+            Min(ref left, ref right, out Vector2 result);
             return result;
         }
 
@@ -1155,8 +1146,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector2 Reflect(Vector2 vector, Vector2 normal)
         {
-            Vector2 result;
-            Reflect(ref vector, ref normal, out result);
+            Reflect(ref vector, ref normal, out Vector2 result);
             return result;
         }
 
@@ -1252,8 +1242,10 @@ namespace FlaxEngine
 
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1297,8 +1289,7 @@ namespace FlaxEngine
         /// <returns>The transformed <see cref="Vector4" />.</returns>
         public static Vector2 Transform(Vector2 vector, Quaternion rotation)
         {
-            Vector2 result;
-            Transform(ref vector, ref rotation, out result);
+            Transform(ref vector, ref rotation, out Vector2 result);
             return result;
         }
 
@@ -1323,8 +1314,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1371,8 +1364,7 @@ namespace FlaxEngine
         /// <returns>The transformed <see cref="Vector4" />.</returns>
         public static Vector4 Transform(Vector2 vector, Matrix transform)
         {
-            Vector4 result;
-            Transform(ref vector, ref transform, out result);
+            Transform(ref vector, ref transform, out Vector4 result);
             return result;
         }
 
@@ -1394,8 +1386,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1444,8 +1438,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector2 TransformCoordinate(Vector2 coordinate, Matrix transform)
         {
-            Vector2 result;
-            TransformCoordinate(ref coordinate, ref transform, out result);
+            TransformCoordinate(ref coordinate, ref transform, out Vector2 result);
             return result;
         }
 
@@ -1477,8 +1470,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1521,8 +1516,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector2 TransformNormal(Vector2 normal, Matrix transform)
         {
-            Vector2 result;
-            TransformNormal(ref normal, ref transform, out result);
+            TransformNormal(ref normal, ref transform, out Vector2 result);
             return result;
         }
 
@@ -1554,8 +1548,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
diff --git a/Source/Engine/Core/Math/Vector4.cs b/Source/Engine/Core/Math/Vector4.cs
index 8fc7ca298..38c77e705 100644
--- a/Source/Engine/Core/Math/Vector4.cs
+++ b/Source/Engine/Core/Math/Vector4.cs
@@ -587,8 +587,7 @@ namespace FlaxEngine
         /// <returns>A new <see cref="Vector4" /> containing the 4D Cartesian coordinates of the specified point.</returns>
         public static Vector4 Barycentric(Vector4 value1, Vector4 value2, Vector4 value3, float amount1, float amount2)
         {
-            Vector4 result;
-            Barycentric(ref value1, ref value2, ref value3, amount1, amount2, out result);
+            Barycentric(ref value1, ref value2, ref value3, amount1, amount2, out Vector4 result);
             return result;
         }
 
@@ -629,8 +628,7 @@ namespace FlaxEngine
         /// <returns>The clamped value.</returns>
         public static Vector4 Clamp(Vector4 value, Vector4 min, Vector4 max)
         {
-            Vector4 result;
-            Clamp(ref value, ref min, ref max, out result);
+            Clamp(ref value, ref min, ref max, out Vector4 result);
             return result;
         }
 
@@ -826,8 +824,7 @@ namespace FlaxEngine
         /// </remarks>
         public static Vector4 Lerp(Vector4 start, Vector4 end, float amount)
         {
-            Vector4 result;
-            Lerp(ref start, ref end, amount, out result);
+            Lerp(ref start, ref end, amount, out Vector4 result);
             return result;
         }
 
@@ -853,8 +850,7 @@ namespace FlaxEngine
         /// <returns>The cubic interpolation of the two vectors.</returns>
         public static Vector4 SmoothStep(Vector4 start, Vector4 end, float amount)
         {
-            Vector4 result;
-            SmoothStep(ref start, ref end, amount, out result);
+            SmoothStep(ref start, ref end, amount, out Vector4 result);
             return result;
         }
 
@@ -893,8 +889,7 @@ namespace FlaxEngine
         /// <returns>The result of the Hermite spline interpolation.</returns>
         public static Vector4 Hermite(Vector4 value1, Vector4 tangent1, Vector4 value2, Vector4 tangent2, float amount)
         {
-            Vector4 result;
-            Hermite(ref value1, ref tangent1, ref value2, ref tangent2, amount, out result);
+            Hermite(ref value1, ref tangent1, ref value2, ref tangent2, amount, out Vector4 result);
             return result;
         }
 
@@ -929,8 +924,7 @@ namespace FlaxEngine
         /// <returns>A vector that is the result of the Catmull-Rom interpolation.</returns>
         public static Vector4 CatmullRom(Vector4 value1, Vector4 value2, Vector4 value3, Vector4 value4, float amount)
         {
-            Vector4 result;
-            CatmullRom(ref value1, ref value2, ref value3, ref value4, amount, out result);
+            CatmullRom(ref value1, ref value2, ref value3, ref value4, amount, out Vector4 result);
             return result;
         }
 
@@ -959,8 +953,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the largest components of the source vectors.</returns>
         public static Vector4 Max(Vector4 left, Vector4 right)
         {
-            Vector4 result;
-            Max(ref left, ref right, out result);
+            Max(ref left, ref right, out Vector4 result);
             return result;
         }
 
@@ -989,8 +982,7 @@ namespace FlaxEngine
         /// <returns>A vector containing the smallest components of the source vectors.</returns>
         public static Vector4 Min(Vector4 left, Vector4 right)
         {
-            Vector4 result;
-            Min(ref left, ref right, out result);
+            Min(ref left, ref right, out Vector4 result);
             return result;
         }
 
@@ -1041,8 +1033,10 @@ namespace FlaxEngine
 
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1096,8 +1090,10 @@ namespace FlaxEngine
 
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1149,8 +1145,7 @@ namespace FlaxEngine
         /// <returns>The transformed <see cref="Vector4" />.</returns>
         public static Vector4 Transform(Vector4 vector, Quaternion rotation)
         {
-            Vector4 result;
-            Transform(ref vector, ref rotation, out result);
+            Transform(ref vector, ref rotation, out Vector4 result);
             return result;
         }
 
@@ -1175,8 +1170,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
@@ -1234,8 +1231,7 @@ namespace FlaxEngine
         /// <returns>The transformed <see cref="Vector4" />.</returns>
         public static Vector4 Transform(Vector4 vector, Matrix transform)
         {
-            Vector4 result;
-            Transform(ref vector, ref transform, out result);
+            Transform(ref vector, ref transform, out Vector4 result);
             return result;
         }
 
@@ -1260,8 +1256,10 @@ namespace FlaxEngine
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+
             if (destination == null)
                 throw new ArgumentNullException(nameof(destination));
+
             if (destination.Length < source.Length)
                 throw new ArgumentOutOfRangeException(nameof(destination), "The destination array must be of same length or larger length than the source array.");
 
diff --git a/Source/Engine/Core/Math/Viewport.cs b/Source/Engine/Core/Math/Viewport.cs
index b8af0de7e..ae2a622e9 100644
--- a/Source/Engine/Core/Math/Viewport.cs
+++ b/Source/Engine/Core/Math/Viewport.cs
@@ -270,12 +270,10 @@ namespace FlaxEngine
         /// <returns>The projected vector.</returns>
         public Vector3 Project(Vector3 source, Matrix projection, Matrix view, Matrix world)
         {
-            Matrix matrix;
-            Matrix.Multiply(ref world, ref view, out matrix);
+            Matrix.Multiply(ref world, ref view, out Matrix matrix);
             Matrix.Multiply(ref matrix, ref projection, out matrix);
 
-            Vector3 vector;
-            Project(ref source, ref matrix, out vector);
+            Project(ref source, ref matrix, out Vector3 vector);
             return vector;
         }
 
@@ -310,13 +308,11 @@ namespace FlaxEngine
         /// <returns>The unprojected Vector.</returns>
         public Vector3 Unproject(Vector3 source, Matrix projection, Matrix view, Matrix world)
         {
-            Matrix matrix;
-            Matrix.Multiply(ref world, ref view, out matrix);
+            Matrix.Multiply(ref world, ref view, out Matrix matrix);
             Matrix.Multiply(ref matrix, ref projection, out matrix);
             Matrix.Invert(ref matrix, out matrix);
 
-            Vector3 vector;
-            Unproject(ref source, ref matrix, out vector);
+            Unproject(ref source, ref matrix, out Vector3 vector);
             return vector;
         }
 
diff --git a/Source/Engine/Graphics/Graphics.Build.cs b/Source/Engine/Graphics/Graphics.Build.cs
index 92b0236d4..ff25348b0 100644
--- a/Source/Engine/Graphics/Graphics.Build.cs
+++ b/Source/Engine/Graphics/Graphics.Build.cs
@@ -32,6 +32,9 @@ public abstract class GraphicsDeviceBaseModule : EngineModule
 /// </summary>
 public class Graphics : EngineModule
 {
+    private static bool _lodMissingVulkanSDK;
+    private static bool _lodMissingWindowsSDK;
+
     /// <inheritdoc />
     public override void Setup(BuildOptions options)
     {
@@ -45,12 +48,12 @@ public class Graphics : EngineModule
             if (VulkanSdk.Instance.IsValid)
                 options.PrivateDependencies.Add("GraphicsDeviceVulkan");
             else
-                Log.Warning("Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)");
+                Log.WarningOnce("Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)", ref _lodMissingVulkanSDK);
             var windowsToolchain = options.Toolchain as Flax.Build.Platforms.WindowsToolchain;
             if (windowsToolchain != null && windowsToolchain.SDK != Flax.Build.Platforms.WindowsPlatformSDK.v8_1)
                 options.PrivateDependencies.Add("GraphicsDeviceDX12");
             else
-                Log.Warning("Building for Windows without DirectX 12 rendering backend (Windows 10 SDK is required)");
+                Log.WarningOnce("Building for Windows without DirectX 12 rendering backend (Windows 10 SDK is required)", ref _lodMissingWindowsSDK);
             break;
         case TargetPlatform.XboxOne:
         case TargetPlatform.UWP:
@@ -64,7 +67,7 @@ public class Graphics : EngineModule
             if (VulkanSdk.Instance.IsValid)
                 options.PrivateDependencies.Add("GraphicsDeviceVulkan");
             else
-                Log.Warning("Building for Linux without Vulkan rendering backend (Vulkan SDK is missing)");
+                Log.WarningOnce("Building for Linux without Vulkan rendering backend (Vulkan SDK is missing)", ref _lodMissingVulkanSDK);
             break;
         case TargetPlatform.PS4:
             options.PrivateDependencies.Add("GraphicsDevicePS4");
diff --git a/Source/Engine/Graphics/Materials/MaterialParams.cpp b/Source/Engine/Graphics/Materials/MaterialParams.cpp
index ea70d4587..5ce55f1c4 100644
--- a/Source/Engine/Graphics/Materials/MaterialParams.cpp
+++ b/Source/Engine/Graphics/Materials/MaterialParams.cpp
@@ -431,6 +431,67 @@ String MaterialParameter::ToString() const
     return String::Format(TEXT("\'{0}\' ({1}:{2}:{3})"), _name, ::ToString(_type), _paramId, _isPublic);
 }
 
+MaterialParameter* MaterialParams::Get(const Guid& id)
+{
+    MaterialParameter* result = nullptr;
+    for (int32 i = 0; i < Count(); i++)
+    {
+        if (At(i).GetParameterID() == id)
+        {
+            result = &At(i);
+            break;
+        }
+    }
+    return result;
+}
+
+MaterialParameter* MaterialParams::Get(const StringView& name)
+{
+    MaterialParameter* result = nullptr;
+    for (int32 i = 0; i < Count(); i++)
+    {
+        if (At(i).GetName() == name)
+        {
+            result = &At(i);
+            break;
+        }
+    }
+    return result;
+}
+
+int32 MaterialParams::Find(const Guid& id)
+{
+    int32 result = -1;
+    for (int32 i = 0; i < Count(); i++)
+    {
+        if (At(i).GetParameterID() == id)
+        {
+            result = i;
+            break;
+        }
+    }
+    return result;
+}
+
+int32 MaterialParams::Find(const StringView& name)
+{
+    int32 result = -1;
+    for (int32 i = 0; i < Count(); i++)
+    {
+        if (At(i).GetName() == name)
+        {
+            result = i;
+            break;
+        }
+    }
+    return result;
+}
+
+int32 MaterialParams::GetVersionHash() const
+{
+    return _versionHash;
+}
+
 void MaterialParams::Bind(MaterialParamsLink* link, MaterialParameter::BindMeta& meta)
 {
     ASSERT(link && link->This);
diff --git a/Source/Engine/Graphics/Materials/MaterialParams.h b/Source/Engine/Graphics/Materials/MaterialParams.h
index ca48dc143..c51ffb8f9 100644
--- a/Source/Engine/Graphics/Materials/MaterialParams.h
+++ b/Source/Engine/Graphics/Materials/MaterialParams.h
@@ -366,72 +366,17 @@ private:
 
 public:
 
-    MaterialParameter* Get(const Guid& id)
-    {
-        MaterialParameter* result = nullptr;
-        for (int32 i = 0; i < Count(); i++)
-        {
-            if (At(i).GetParameterID() == id)
-            {
-                result = &At(i);
-                break;
-            }
-        }
-        return result;
-    }
-
-    MaterialParameter* Get(const StringView& name)
-    {
-        MaterialParameter* result = nullptr;
-        for (int32 i = 0; i < Count(); i++)
-        {
-            if (At(i).GetName() == name)
-            {
-                result = &At(i);
-                break;
-            }
-        }
-        return result;
-    }
-
-    int32 Find(const Guid& id)
-    {
-        int32 result = -1;
-        for (int32 i = 0; i < Count(); i++)
-        {
-            if (At(i).GetParameterID() == id)
-            {
-                result = i;
-                break;
-            }
-        }
-        return result;
-    }
-
-    int32 Find(const StringView& name)
-    {
-        int32 result = -1;
-        for (int32 i = 0; i < Count(); i++)
-        {
-            if (At(i).GetName() == name)
-            {
-                result = i;
-                break;
-            }
-        }
-        return result;
-    }
+    MaterialParameter* Get(const Guid& id);
+    MaterialParameter* Get(const StringView& name);
+    int32 Find(const Guid& id);
+    int32 Find(const StringView& name);
 
 public:
 
     /// <summary>
     /// Gets the parameters version hash. Every time the parameters are modified (loaded, edited, etc.) the hash changes. Can be used to sync instanced parameters collection.
     /// </summary>
-    /// <returns>The hash.</returns>
-    FORCE_INLINE int32 GetVersionHash() const
-    {
-        return _versionHash;
-    }
+    int32 GetVersionHash() const;
 
 public:
 
diff --git a/Source/Engine/Navigation/NavMeshRuntime.cpp b/Source/Engine/Navigation/NavMeshRuntime.cpp
index 3d112a39e..5278730f1 100644
--- a/Source/Engine/Navigation/NavMeshRuntime.cpp
+++ b/Source/Engine/Navigation/NavMeshRuntime.cpp
@@ -51,7 +51,7 @@ bool NavMeshRuntime::FindDistanceToWall(const Vector3& startPosition, NavMeshHit
     ScopeLock lock(Locker);
 
     const auto query = GetNavMeshQuery();
-    if (!query)
+    if (!query || !_navMesh)
     {
         return false;
     }
@@ -89,7 +89,7 @@ bool NavMeshRuntime::FindPath(const Vector3& startPosition, const Vector3& endPo
     ScopeLock lock(Locker);
 
     const auto query = GetNavMeshQuery();
-    if (!query)
+    if (!query || !_navMesh)
     {
         return false;
     }
@@ -158,7 +158,7 @@ bool NavMeshRuntime::TestPath(const Vector3& startPosition, const Vector3& endPo
     ScopeLock lock(Locker);
 
     const auto query = GetNavMeshQuery();
-    if (!query)
+    if (!query || !_navMesh)
     {
         return false;
     }
@@ -205,7 +205,7 @@ bool NavMeshRuntime::ProjectPoint(const Vector3& point, Vector3& result) const
     ScopeLock lock(Locker);
 
     const auto query = GetNavMeshQuery();
-    if (!query)
+    if (!query || !_navMesh)
     {
         return false;
     }
@@ -236,7 +236,7 @@ bool NavMeshRuntime::RayCast(const Vector3& startPosition, const Vector3& endPos
     ScopeLock lock(Locker);
 
     const auto query = GetNavMeshQuery();
-    if (!query)
+    if (!query || !_navMesh)
     {
         return false;
     }
diff --git a/Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.cpp b/Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.cpp
index 6ba0ee8fa..e2aed3033 100644
--- a/Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.cpp
+++ b/Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.cpp
@@ -505,7 +505,7 @@ void ParticleEmitterGraphCPUExecutor::Update(ParticleEmitter* emitter, ParticleE
             // Initialize particles data
             //Platform::MemoryClear(data.Buffer->GetParticleCPU(countBefore), spawnCount * data.Buffer->Stride);
             for (int32 i = 0; i < spawnCount; i++)
-                Platform::MemoryCopy(data.Buffer->GetParticleCPU(countBefore), _graph._defaultParticleData.Get(), data.Buffer->Stride);
+                Platform::MemoryCopy(data.Buffer->GetParticleCPU(countBefore + i), _graph._defaultParticleData.Get(), data.Buffer->Stride);
 
             // Initialize particles
             for (int32 i = 0; i < _graph.InitModules.Count(); i++)
diff --git a/Source/Engine/Platform/Win32/Win32Platform.cpp b/Source/Engine/Platform/Win32/Win32Platform.cpp
index b01b96feb..bde502885 100644
--- a/Source/Engine/Platform/Win32/Win32Platform.cpp
+++ b/Source/Engine/Platform/Win32/Win32Platform.cpp
@@ -12,12 +12,12 @@
 #include "Engine/Core/Collections/HashFunctions.h"
 #include "Engine/Core/Log.h"
 #include "IncludeWindowsHeaders.h"
-
 #include <Psapi.h>
 #include <WinSock2.h>
 #include <IPHlpApi.h>
 #include <oleauto.h>
 #include <WinBase.h>
+#include <xmmintrin.h>
 #pragma comment(lib, "Iphlpapi.lib")
 
 namespace
@@ -298,6 +298,24 @@ void Win32Platform::AtomicStore(int64 volatile* dst, int64 value)
     InterlockedExchange64(dst, value);
 }
 
+void Win32Platform::Prefetch(void const* ptr)
+{
+    _mm_prefetch((char const*)ptr, _MM_HINT_T0);
+}
+
+void* Win32Platform::Allocate(uint64 size, uint64 alignment)
+{
+#if COMPILE_WITH_PROFILER
+    TrackAllocation(size);
+#endif
+    return _aligned_malloc((size_t)size, (size_t)alignment);
+}
+
+void Win32Platform::Free(void* ptr)
+{
+    _aligned_free(ptr);
+}
+
 bool Win32Platform::Is64BitPlatform()
 {
 #ifdef PLATFORM_64BITS
diff --git a/Source/Engine/Platform/Win32/Win32Platform.h b/Source/Engine/Platform/Win32/Win32Platform.h
index cde506278..153b44d1a 100644
--- a/Source/Engine/Platform/Win32/Win32Platform.h
+++ b/Source/Engine/Platform/Win32/Win32Platform.h
@@ -5,7 +5,6 @@
 #if PLATFORM_WIN32
 
 #include "Engine/Platform/Base/PlatformBase.h"
-#include <xmmintrin.h>
 
 /// <summary>
 /// The Win32 platform implementation and application management utilities.
@@ -28,21 +27,9 @@ public:
     static int64 AtomicRead(int64 volatile* dst);
     static void AtomicStore(int32 volatile* dst, int32 value);
     static void AtomicStore(int64 volatile* dst, int64 value);
-    FORCE_INLINE static void Prefetch(void const* ptr)
-    {
-        _mm_prefetch((char const*)ptr, _MM_HINT_T0);
-    }
-    FORCE_INLINE static void* Allocate(uint64 size, uint64 alignment)
-    {
-#if COMPILE_WITH_PROFILER
-        TrackAllocation(size);
-#endif
-        return _aligned_malloc((size_t)size, (size_t)alignment);
-    }
-    FORCE_INLINE static void Free(void* ptr)
-    {
-        _aligned_free(ptr);
-    }
+    static void Prefetch(void const* ptr);
+    static void* Allocate(uint64 size, uint64 alignment);
+    static void Free(void* ptr);
     static bool Is64BitPlatform();
     static BatteryInfo GetBatteryInfo();
     static CPUInfo GetCPUInfo();
diff --git a/Source/Engine/Render2D/Render2D.cpp b/Source/Engine/Render2D/Render2D.cpp
index 6e6936cc5..7bf23756c 100644
--- a/Source/Engine/Render2D/Render2D.cpp
+++ b/Source/Engine/Render2D/Render2D.cpp
@@ -270,6 +270,34 @@ FORCE_INLINE Render2DVertex MakeVertex(const Vector2& point, const Vector2& uv,
     };
 }
 
+void WriteTri(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Vector2& uv0, const Vector2& uv1, const Vector2& uv2, const Color& color0, const Color& color1, const Color& color2)
+{
+    Render2DVertex tris[3];
+    tris[0] = MakeVertex(p0, uv0, color0);
+    tris[1] = MakeVertex(p1, uv1, color1);
+    tris[2] = MakeVertex(p2, uv2, color2);
+    VB.Write(tris, sizeof(tris));
+
+    uint32 indices[3];
+    indices[0] = VBIndex + 0;
+    indices[1] = VBIndex + 1;
+    indices[2] = VBIndex + 2;
+    IB.Write(indices, sizeof(indices));
+    
+    VBIndex += 3;
+    IBIndex += 3;
+}
+
+void WriteTri(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Color& color0, const Color& color1, const Color& color2)
+{
+    WriteTri(p0, p1, p2, Vector2::Zero, Vector2::Zero, Vector2::Zero, color0, color1, color2);
+}
+
+void WriteTri(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Vector2& uv0, const Vector2& uv1, const Vector2& uv2)
+{
+    WriteTri(p0, p1, p2, uv0, uv1, uv2, Color::Black, Color::Black, Color::Black);
+}
+
 void WriteRect(const Rectangle& rect, const Color& color1, const Color& color2, const Color& color3, const Color& color4)
 {
     const Vector2 uvUpperLeft = Vector2::Zero;
@@ -1716,3 +1744,45 @@ void Render2D::DrawBlur(const Rectangle& rect, float blurStrength)
     drawCall.AsBlur.BottomRightY = p.Y;
     WriteRect(rect, Color::White);
 }
+
+void Render2D::DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs)
+{
+    CHECK(vertices.Length() == uvs.Length())
+    
+    RENDER2D_CHECK_RENDERING_STATE;
+    
+    Render2DDrawCall& drawCall = DrawCalls.AddOne();
+    drawCall.Type = DrawCallType::FillTexture;
+    drawCall.StartIB = IBIndex;
+    drawCall.CountIB = vertices.Length();
+    drawCall.AsTexture.Ptr = t;
+
+    for (int32 i = 0; i < vertices.Length(); i += 3)
+        WriteTri(vertices[i], vertices[i + 1], vertices[i + 2], uvs[i], uvs[i + 1], uvs[i + 2]);
+}
+
+void Render2D::FillTriangles(const Span<Vector2>& vertices, const Span<Color>& colors, bool useAlpha)
+{
+    CHECK(vertices.Length() == colors.Length());
+    
+    RENDER2D_CHECK_RENDERING_STATE;
+    
+    Render2DDrawCall& drawCall = DrawCalls.AddOne();
+    drawCall.Type = useAlpha ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha;
+    drawCall.StartIB = IBIndex;
+    drawCall.CountIB = vertices.Length();
+
+    for (int32 i = 0; i < vertices.Length(); i += 3)
+        WriteTri(vertices[i], vertices[i + 1], vertices[i + 2], colors[i], colors[i + 1], colors[i + 2]);
+}
+
+void Render2D::FillTriangle(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Color& color)
+{
+    RENDER2D_CHECK_RENDERING_STATE;
+    
+    Render2DDrawCall& drawCall = DrawCalls.AddOne();
+    drawCall.Type = color.A < 1.0f ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha;
+    drawCall.StartIB = IBIndex;
+    drawCall.CountIB = 3;
+    WriteTri(p0, p1, p2, color, color, color);
+}
diff --git a/Source/Engine/Render2D/Render2D.h b/Source/Engine/Render2D/Render2D.h
index a421c56a6..a6eba94e4 100644
--- a/Source/Engine/Render2D/Render2D.h
+++ b/Source/Engine/Render2D/Render2D.h
@@ -4,6 +4,7 @@
 
 #include "Engine/Core/Math/Color.h"
 #include "Engine/Scripting/ScriptingType.h"
+#include "Engine/Core/Types/Span.h"
 
 struct SpriteHandle;
 struct TextLayoutOptions;
@@ -339,4 +340,29 @@ public:
     /// <param name="rect">The target rectangle to draw (blurs its background).</param>
     /// <param name="blurStrength">The blur strength defines how blurry the background is. Larger numbers increase blur, resulting in a larger runtime cost on the GPU.</param>
     API_FUNCTION() static void DrawBlur(const Rectangle& rect, float blurStrength);
+
+    /// <summary>
+    /// Draws vertices array.
+    /// </summary>
+    /// <param name="t">The texture.</param>
+    /// <param name="vertices">The vertices array.</param>
+    /// <param name="uvs">The uvs array.</param>
+    API_FUNCTION() static void DrawTexturedTriangles(GPUTexture* t, const Span<Vector2>& vertices, const Span<Vector2>& uvs);
+    
+    /// <summary>
+    /// Draws vertices array.
+    /// </summary>
+    /// <param name="vertices">The vertices array.</param>
+    /// <param name="colors">The colors array.</param>
+    /// <param name="useAlpha">If true alpha blending will be enabled.</param>
+    API_FUNCTION() static void FillTriangles(const Span<Vector2>& vertices, const Span<Color>& colors, bool useAlpha);
+
+    /// <summary>
+    /// Fills a triangular area.
+    /// </summary>
+    /// <param name="p0">The first point.</param>
+    /// <param name="p1">The second point.</param>
+    /// <param name="p2">The third point.</param>
+    /// <param name="color">The color.</param>
+    API_FUNCTION() static void FillTriangle(const Vector2& p0, const Vector2& p1, const Vector2& p2, const Color& color);
 };
diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
index c1f250824..4866b3483 100644
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
@@ -457,6 +457,35 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value)
         color = writeLocal(ValueType::Vector3, String::Format(TEXT("clamp({0}, 0.0f, 255.0f) / 255.0f"), color.Value), node);
         value = writeLocal(ValueType::Vector3, String::Format(TEXT("{1} < 1000.0f ? {0} * {1}/1000.0f : {0}"), color.Value, temperature.Value), node);
         break;
+    }
+        // HSVToRGB
+    case 36:
+    {
+        const auto hsv = tryGetValue(node->GetBox(0), node->Values[0]).AsVector3();
+
+        // Normalize from 360
+        auto color = writeLocal(ValueType::Vector3, String::Format(TEXT("float3({0}.x / 360.0f, {0}.y, {0}.z)"), hsv.Value), node);
+
+        auto x1 = writeLocal(ValueType::Vector3, String::Format(TEXT("clamp(abs(fmod({0}.x * 6.0 + float3(0.0f, 4.0f, 2.0f), 6.0f) - 3.0f) - 1.0f, 0.0f, 1.0f)"), color.Value), node);
+        value = writeLocal(ValueType::Vector3, String::Format(TEXT("{1}.z * lerp(float3(1.0, 1.0, 1.0), {0}, {1}.y)"), x1.Value, color.Value), node);
+        break;
+    }
+        // RGBToHSV
+    case 37:
+    {
+        // Reference: Ian Taylor, https://www.chilliant.com/rgb2hsv.html
+
+        const auto rgb = tryGetValue(node->GetBox(0), node->Values[0]).AsVector3();
+        const auto epsilon = writeLocal(ValueType::Float, TEXT("1e-10"), node);
+
+        auto p = writeLocal(ValueType::Vector4, String::Format(TEXT("({0}.g < {0}.b) ? float4({0}.bg, -1.0f, 2.0f/3.0f) : float4({0}.gb, 0.0f, -1.0f/3.0f)"), rgb.Value), node);
+        auto q = writeLocal(ValueType::Vector4, String::Format(TEXT("({0}.r < {1}.x) ? float4({1}.xyw, {0}.r) : float4({0}.r, {1}.yzx)"), rgb.Value, p.Value), node);
+        auto c = writeLocal(ValueType::Float, String::Format(TEXT("{0}.x - min({0}.w, {0}.y)"), q.Value), node);
+        auto h = writeLocal(ValueType::Float , String::Format(TEXT("abs(({0}.w - {0}.y) / (6 * {1} + {2}) + {0}.z)"), q.Value, c.Value, epsilon.Value), node);
+        
+        auto hcv = writeLocal(ValueType::Vector3, String::Format(TEXT("float3({0}, {1}, {2}.x)"), h.Value, c.Value, q.Value), node);
+        value = writeLocal(ValueType::Vector3, String::Format(TEXT("float3({0}.x * 360.0f, {0}.y / ({0}.z + {1}), {0}.z)"), hcv.Value, epsilon.Value), node);
+        break;
     }
     default:
         break;
diff --git a/Source/Engine/UI/GUI/CanvasContainer.cs b/Source/Engine/UI/GUI/CanvasContainer.cs
index 1e2fde47b..56c513ece 100644
--- a/Source/Engine/UI/GUI/CanvasContainer.cs
+++ b/Source/Engine/UI/GUI/CanvasContainer.cs
@@ -32,8 +32,11 @@ namespace FlaxEngine.GUI
         private bool IntersectsChildContent(CanvasRootControl child, ref Ray ray, out Vector2 childSpaceLocation)
         {
             // Inline bounds calculations (it will reuse world matrix)
-            OrientedBoundingBox bounds = new OrientedBoundingBox();
-            bounds.Extents = new Vector3(child.Size * 0.5f, Mathf.Epsilon);
+            OrientedBoundingBox bounds = new OrientedBoundingBox
+            {
+                Extents = new Vector3(child.Size * 0.5f, Mathf.Epsilon)
+            };
+
             child.Canvas.GetWorldMatrix(out var world);
             Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out var offset);
             Matrix.Multiply(ref offset, ref world, out bounds.Transformation);
diff --git a/Source/Engine/UI/GUI/CanvasRootControl.cs b/Source/Engine/UI/GUI/CanvasRootControl.cs
index 268d0e311..b40a9a3bf 100644
--- a/Source/Engine/UI/GUI/CanvasRootControl.cs
+++ b/Source/Engine/UI/GUI/CanvasRootControl.cs
@@ -123,11 +123,9 @@ namespace FlaxEngine.GUI
                 return location;
 
             // Transform canvas local-space point to the game root location
-            Matrix world;
-            _canvas.GetWorldMatrix(out world);
-            Vector3 locationWorldSpace;
+            _canvas.GetWorldMatrix(out Matrix world);
             Vector3 locationCanvasSpace = new Vector3(location, 0.0f);
-            Vector3.Transform(ref locationCanvasSpace, ref world, out locationWorldSpace);
+            Vector3.Transform(ref locationCanvasSpace, ref world, out Vector3 locationWorldSpace);
             camera.ProjectPoint(locationWorldSpace, out location);
             return location;
         }
diff --git a/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs b/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
index 58e5bdaac..6bbcf6e1f 100644
--- a/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
@@ -281,7 +281,7 @@ namespace FlaxEngine.GUI
                     Vector2 leftEdge = selection.StartIndex <= textBlock.Range.StartIndex ? textBlock.Bounds.UpperLeft : font.GetCharPosition(_text, selection.StartIndex);
                     Vector2 rightEdge = selection.EndIndex >= textBlock.Range.EndIndex ? textBlock.Bounds.UpperRight : font.GetCharPosition(_text, selection.EndIndex);
                     float alpha = Mathf.Min(1.0f, Mathf.Cos(_animateTime * BackgroundSelectedFlashSpeed) * 0.5f + 1.3f);
-                    alpha = alpha * alpha;
+                    alpha *= alpha;
                     Color selectionColor = Color.White * alpha;
                     Rectangle selectionRect = new Rectangle(leftEdge.X, leftEdge.Y, rightEdge.X - leftEdge.X, font.Height);
                     textBlock.Style.BackgroundSelectedBrush.Draw(selectionRect, selectionColor);
diff --git a/Source/Engine/UI/GUI/Common/TextBox.cs b/Source/Engine/UI/GUI/Common/TextBox.cs
index 8c7db6e19..36460130f 100644
--- a/Source/Engine/UI/GUI/Common/TextBox.cs
+++ b/Source/Engine/UI/GUI/Common/TextBox.cs
@@ -165,7 +165,7 @@ namespace FlaxEngine.GUI
 
                 // Draw selection background
                 float alpha = Mathf.Min(1.0f, Mathf.Cos(_animateTime * BackgroundSelectedFlashSpeed) * 0.5f + 1.3f);
-                alpha = alpha * alpha;
+                alpha *= alpha;
                 Color selectionColor = SelectionColor * alpha;
                 //
                 int selectedLinesCount = 1 + Mathf.FloorToInt((rightEdge.Y - leftEdge.Y) / fontHeight);
diff --git a/Source/Engine/UI/GUI/Control.Bounds.cs b/Source/Engine/UI/GUI/Control.Bounds.cs
index 521f483e9..e74c73e66 100644
--- a/Source/Engine/UI/GUI/Control.Bounds.cs
+++ b/Source/Engine/UI/GUI/Control.Bounds.cs
@@ -368,9 +368,8 @@ namespace FlaxEngine.GUI
         public void UpdateTransform()
         {
             // Actual pivot and negative pivot
-            Vector2 v1, v2;
-            Vector2.Multiply(ref _pivot, ref _bounds.Size, out v1);
-            Vector2.Negate(ref v1, out v2);
+            Vector2.Multiply(ref _pivot, ref _bounds.Size, out Vector2 v1);
+            Vector2.Negate(ref v1, out Vector2 v2);
             Vector2.Add(ref v1, ref _bounds.Location, out v1);
 
             // ------ Matrix3x3 based version:
@@ -400,16 +399,14 @@ namespace FlaxEngine.GUI
             // ------ Matrix2x2 based version:
 
             // 2D transformation
-            Matrix2x2 m1, m2;
-            Matrix2x2.Scale(ref _scale, out m1);
-            Matrix2x2.Shear(ref _shear, out m2);
+            Matrix2x2.Scale(ref _scale, out Matrix2x2 m1);
+            Matrix2x2.Shear(ref _shear, out Matrix2x2 m2);
             Matrix2x2.Multiply(ref m1, ref m2, out m1);
             Matrix2x2.Rotation(Mathf.DegreesToRadians * _rotation, out m2);
             Matrix2x2.Multiply(ref m1, ref m2, out m1);
 
             // Mix all the stuff
-            Matrix3x3 m3;
-            Matrix3x3.Translation2D(ref v2, out m3);
+            Matrix3x3.Translation2D(ref v2, out Matrix3x3 m3);
             Matrix3x3 m4 = (Matrix3x3)m1;
             Matrix3x3.Multiply(ref m3, ref m4, out m3);
             Matrix3x3.Translation2D(ref v1, out m4);
diff --git a/Source/Engine/UI/GUI/Panels/GridPanel.cs b/Source/Engine/UI/GUI/Panels/GridPanel.cs
index a8d6d3ff7..1a0e69338 100644
--- a/Source/Engine/UI/GUI/Panels/GridPanel.cs
+++ b/Source/Engine/UI/GUI/Panels/GridPanel.cs
@@ -40,9 +40,7 @@ namespace FlaxEngine.GUI
             get => _cellsV;
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException();
-                _cellsV = value;
+                _cellsV = value ?? throw new ArgumentNullException();
                 PerformLayout();
             }
         }
@@ -56,9 +54,7 @@ namespace FlaxEngine.GUI
             get => _cellsH;
             set
             {
-                if (value == null)
-                    throw new ArgumentNullException();
-                _cellsH = value;
+                _cellsH = value ?? throw new ArgumentNullException();
                 PerformLayout();
             }
         }
diff --git a/Source/Engine/UI/GUI/Panels/Panel.cs b/Source/Engine/UI/GUI/Panels/Panel.cs
index d4e68ce87..8be61bbf6 100644
--- a/Source/Engine/UI/GUI/Panels/Panel.cs
+++ b/Source/Engine/UI/GUI/Panels/Panel.cs
@@ -64,8 +64,10 @@ namespace FlaxEngine.GUI
                         VScrollBar = GetChild<VScrollBar>();
                     if (VScrollBar == null)
                     {
-                        VScrollBar = new VScrollBar(this, Width - ScrollBar.DefaultSize, Height);
-                        VScrollBar.AnchorPreset = AnchorPresets.TopLeft;
+                        VScrollBar = new VScrollBar(this, Width - ScrollBar.DefaultSize, Height)
+                        {
+                            AnchorPreset = AnchorPresets.TopLeft
+                        };
                         //VScrollBar.X += VScrollBar.Width;
                         VScrollBar.ValueChanged += () => SetViewOffset(Orientation.Vertical, VScrollBar.Value);
                     }
@@ -82,8 +84,10 @@ namespace FlaxEngine.GUI
                         HScrollBar = GetChild<HScrollBar>();
                     if (HScrollBar == null)
                     {
-                        HScrollBar = new HScrollBar(this, Height - ScrollBar.DefaultSize, Width);
-                        HScrollBar.AnchorPreset = AnchorPresets.TopLeft;
+                        HScrollBar = new HScrollBar(this, Height - ScrollBar.DefaultSize, Width)
+                        {
+                            AnchorPreset = AnchorPresets.TopLeft
+                        };
                         //HScrollBar.Y += HScrollBar.Height;
                         //HScrollBar.Offsets += new Margin(0, 0, HScrollBar.Height * 0.5f, 0);
                         HScrollBar.ValueChanged += () => SetViewOffset(Orientation.Horizontal, HScrollBar.Value);
diff --git a/Source/Engine/UI/GUI/RenderOutputControl.cs b/Source/Engine/UI/GUI/RenderOutputControl.cs
index 74210c9df..be0c300fe 100644
--- a/Source/Engine/UI/GUI/RenderOutputControl.cs
+++ b/Source/Engine/UI/GUI/RenderOutputControl.cs
@@ -89,13 +89,11 @@ namespace FlaxEngine.GUI
         /// <exception cref="System.ArgumentNullException">Invalid task.</exception>
         public RenderOutputControl(SceneRenderTask task)
         {
-            if (task == null)
-                throw new ArgumentNullException();
+            _task = task ?? throw new ArgumentNullException();
 
             _backBuffer = GPUDevice.Instance.CreateTexture();
             _resizeTime = ResizeCheckTime;
 
-            _task = task;
             _task.Output = _backBuffer;
             _task.End += OnEnd;
 
diff --git a/Source/Engine/UI/GUI/Tooltip.cs b/Source/Engine/UI/GUI/Tooltip.cs
index 24c0651ed..5d03bf75c 100644
--- a/Source/Engine/UI/GUI/Tooltip.cs
+++ b/Source/Engine/UI/GUI/Tooltip.cs
@@ -162,9 +162,7 @@ namespace FlaxEngine.GUI
 
                 if (_timeToPopupLeft <= 0.0f)
                 {
-                    Vector2 location;
-                    Rectangle area;
-                    if (_lastTarget.OnShowTooltip(out _currentText, out location, out area))
+                    if (_lastTarget.OnShowTooltip(out _currentText, out Vector2 location, out Rectangle area))
                     {
                         Show(_lastTarget, location, area);
                     }
@@ -223,8 +221,6 @@ namespace FlaxEngine.GUI
                               TextAlignment.Center,
                               TextWrapping.WrapWords
                              );
-
-            base.Draw();
         }
 
         /// <inheritdoc />
diff --git a/Source/Engine/UI/UICanvas.cs b/Source/Engine/UI/UICanvas.cs
index 426441493..99bc35672 100644
--- a/Source/Engine/UI/UICanvas.cs
+++ b/Source/Engine/UI/UICanvas.cs
@@ -62,12 +62,9 @@ namespace FlaxEngine
             Profiler.BeginEventGPU("UI Canvas");
 
             // Calculate rendering matrix (world*view*projection)
-            Matrix viewProjectionMatrix;
-            Matrix worldMatrix;
-            Canvas.GetWorldMatrix(out worldMatrix);
-            Matrix viewMatrix;
-            Matrix.Multiply(ref worldMatrix, ref renderContext.View.View, out viewMatrix);
-            Matrix.Multiply(ref viewMatrix, ref renderContext.View.Projection, out viewProjectionMatrix);
+            Canvas.GetWorldMatrix(out Matrix worldMatrix);
+            Matrix.Multiply(ref worldMatrix, ref renderContext.View.View, out Matrix viewMatrix);
+            Matrix.Multiply(ref viewMatrix, ref renderContext.View.Projection, out Matrix viewProjectionMatrix);
 
             // Pick a depth buffer
             GPUTexture depthBuffer = Canvas.IgnoreDepth ? null : renderContext.Buffers.DepthBuffer;
@@ -234,8 +231,10 @@ namespace FlaxEngine
         /// </summary>
         public UICanvas()
         {
-            _guiRoot = new CanvasRootControl(this);
-            _guiRoot.IsLayoutLocked = false;
+            _guiRoot = new CanvasRootControl(this)
+            {
+                IsLayoutLocked = false
+            };
         }
 
         /// <summary>
@@ -245,12 +244,12 @@ namespace FlaxEngine
         {
             get
             {
-                OrientedBoundingBox bounds = new OrientedBoundingBox();
-                bounds.Extents = new Vector3(_guiRoot.Size * 0.5f, Mathf.Epsilon);
-                Matrix world;
-                GetWorldMatrix(out world);
-                Matrix offset;
-                Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out offset);
+                OrientedBoundingBox bounds = new OrientedBoundingBox
+                {
+                    Extents = new Vector3(_guiRoot.Size * 0.5f, Mathf.Epsilon)
+                };
+                GetWorldMatrix(out Matrix world);
+                Matrix.Translation(bounds.Extents.X, bounds.Extents.Y, 0, out Matrix offset);
                 Matrix.Multiply(ref offset, ref world, out bounds.Transformation);
                 return bounds;
             }
diff --git a/Source/Engine/UI/UIControl.cs b/Source/Engine/UI/UIControl.cs
index b31d9cab0..8fd4f8f72 100644
--- a/Source/Engine/UI/UIControl.cs
+++ b/Source/Engine/UI/UIControl.cs
@@ -97,11 +97,11 @@ namespace FlaxEngine
                     return new OrientedBoundingBox();
 
                 // Find control bounds limit points in canvas-space
-                var p1 = Vector2.Zero;
-                var p2 = new Vector2(0, Control.Height);
-                var p3 = new Vector2(Control.Width, 0);
-                var p4 = Control.Size;
-                var c = Control;
+                Vector2 p1 = Vector2.Zero;
+                Vector2 p2 = new Vector2(0, Control.Height);
+                Vector2 p3 = new Vector2(Control.Width, 0);
+                Vector2 p4 = Control.Size;
+                Control c = Control;
                 while (c != canvasRoot)
                 {
                     p1 = c.PointToParent(ref p1);
@@ -111,17 +111,18 @@ namespace FlaxEngine
 
                     c = c.Parent;
                 }
-                var min = Vector2.Min(Vector2.Min(p1, p2), Vector2.Min(p3, p4));
-                var max = Vector2.Max(Vector2.Max(p1, p2), Vector2.Max(p3, p4));
-                var size = max - min;
+                Vector2 min = Vector2.Min(Vector2.Min(p1, p2), Vector2.Min(p3, p4));
+                Vector2 max = Vector2.Max(Vector2.Max(p1, p2), Vector2.Max(p3, p4));
+                Vector2 size = max - min;
 
                 // Calculate bounds
-                OrientedBoundingBox bounds = new OrientedBoundingBox();
-                bounds.Extents = new Vector3(size * 0.5f, Mathf.Epsilon);
-                Matrix world;
-                canvasRoot.Canvas.GetWorldMatrix(out world);
-                Matrix offset;
-                Matrix.Translation(min.X + size.X * 0.5f, min.Y + size.Y * 0.5f, 0, out offset);
+                OrientedBoundingBox bounds = new OrientedBoundingBox
+                {
+                    Extents = new Vector3(size * 0.5f, Mathf.Epsilon)
+                };
+
+                canvasRoot.Canvas.GetWorldMatrix(out Matrix world);
+                Matrix.Translation(min.X + size.X * 0.5f, min.Y + size.Y * 0.5f, 0, out Matrix offset);
                 Matrix.Multiply(ref offset, ref world, out bounds.Transformation);
                 return bounds;
             }
@@ -160,9 +161,11 @@ namespace FlaxEngine
             if (!(_control is ContainerControl))
                 throw new InvalidOperationException("To add child to the control it has to be ContainerControl.");
 
-            var child = new UIControl();
-            child.Parent = this;
-            child.Control = (Control)Activator.CreateInstance(typeof(T));
+            var child = new UIControl
+            {
+                Parent = this,
+                Control = (Control)Activator.CreateInstance(typeof(T))
+            };
             return child;
         }
 
diff --git a/Source/Engine/Utilities/Extensions.cs b/Source/Engine/Utilities/Extensions.cs
index e9030af77..b3f6d2053 100644
--- a/Source/Engine/Utilities/Extensions.cs
+++ b/Source/Engine/Utilities/Extensions.cs
@@ -60,172 +60,6 @@ namespace FlaxEngine.Utilities
             }, removeEmptyLines ? StringSplitOptions.RemoveEmptyEntries : StringSplitOptions.None);
         }
 
-        /// <summary>
-        /// Gets a random double.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <param name="maxValue">The maximum value</param>
-        /// <returns>A random double</returns>
-        public static double NextDouble(this Random random, double maxValue)
-        {
-            return random.NextDouble() * maxValue;
-        }
-
-        /// <summary>
-        /// Gets a random double.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <param name="minValue">The minimum value</param>
-        /// <param name="maxValue">The maximum value</param>
-        /// <returns>A random double</returns>
-        public static double NextDouble(this Random random, double minValue, double maxValue)
-        {
-            return random.NextDouble() * (maxValue - minValue) + minValue;
-        }
-
-        /// <summary>
-        /// Gets a random float.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns>A random float</returns>
-        public static float NextFloat(this Random random)
-        {
-            return (float)random.NextDouble();
-        }
-
-        /// <summary>
-        /// Gets a random float.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <param name="maxValue">The maximum value</param>
-        /// <returns>A random float</returns>
-        public static float NextFloat(this Random random, float maxValue)
-        {
-            return (float)random.NextDouble() * maxValue;
-        }
-
-        /// <summary>
-        /// Gets a random float.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <param name="minValue">The minimum value</param>
-        /// <param name="maxValue">The maximum value</param>
-        /// <returns></returns>
-        public static float NextFloat(this Random random, float minValue, float maxValue)
-        {
-            return (float)random.NextDouble() * (maxValue - minValue) + minValue;
-        }
-
-        /// <summary>
-        /// Gets a random Color.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        public static Color NextColor(this Random random)
-        {
-            return new Color(NextFloat(random, 1.0f),
-                             NextFloat(random, 1.0f),
-                             NextFloat(random, 1.0f),
-                             NextFloat(random, 1.0f));
-        }
-
-        /// <summary>
-        /// Gets a random Vector2 with components in range [0;1].
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        public static Vector2 NextVector2(this Random random)
-        {
-            return new Vector2(NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f));
-        }
-
-        /// <summary>
-        /// Gets a random Vector3 with components in range [0;1].
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        public static Vector3 NextVector3(this Random random)
-        {
-            return new Vector3(NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f));
-        }
-
-        /// <summary>
-        /// Gets a random Vector4 with components in range [0;1].
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        public static Vector4 NextVector4(this Random random)
-        {
-            return new Vector4(NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f),
-                               NextFloat(random, 1.0f));
-        }
-
-        /// <summary>
-        /// Gets a random Quaternion.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        public static Quaternion NextQuaternion(this Random random)
-        {
-            return Quaternion.Euler(NextFloat(random, -180, 180),
-                                    NextFloat(random, -180, 180),
-                                    NextFloat(random, -180, 180));
-        }
-
-        /// <summary>
-        /// Gets a random 64-bit signed integer value.
-        /// </summary>
-        /// <param name="random">The random.</param>
-        /// <returns></returns>
-        internal static long NextLong(this Random random)
-        {
-            var numArray = new byte[8];
-            random.NextBytes(numArray);
-            return (long)(BitConverter.ToUInt64(numArray, 0) & 9223372036854775807L);
-        }
-
-        /// <summary>
-        /// Generates a random normalized 2D direction vector.
-        /// </summary>
-        /// <param name="random">An instance of <see cref="Random"/>.</param>
-        /// <returns>A random normalized 2D direction vector.</returns>
-        public static Vector2 NextDirection2D(this Random random)
-        {
-            return Vector2.Normalize(new Vector2((float)random.NextDouble(), (float)random.NextDouble()));
-        }
-
-        /// <summary>
-        /// Generates a random normalized 3D direction vector.
-        /// </summary>
-        /// <param name="random">An instance of <see cref="Random"/>.</param>
-        /// <returns>A random normalized 3D direction vector.</returns>
-        public static Vector3 NextDirection3D(this Random random)
-        {
-            return Vector3.Normalize(new Vector3((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble()));
-        }
-
-        /// <summary>
-        /// Generates a random point in a circle of a given radius.
-        /// </summary>
-        /// <param name="random">An instance of <see cref="Random"/>.</param>
-        /// <param name="radius">Radius of circle. Default 1.0f.</param>
-        /// <returns>A random point in a circle of a given radius.</returns>
-        public static Vector2 PointInACircle(this Random random, float radius = 1.0f)
-        {
-            var randomRadius = (float)random.NextDouble() * radius;
-
-            return new Vector2
-            {
-                X = (float)Math.Cos(random.NextDouble()) * randomRadius,
-                Y = (float)Math.Sin(random.NextDouble()) * randomRadius,
-            };
-        }
-
         /// <summary>
         /// Adds the elements of the specified collection to the end of the <see cref="ICollection{T}"/>.
         /// </summary>
@@ -236,15 +70,9 @@ namespace FlaxEngine.Utilities
         public static void AddRange<T>(this ICollection<T> destination, IEnumerable<T> collection)
         {
             if (destination == null)
-            {
                 throw new ArgumentNullException(nameof(destination));
-            }
-
             if (collection == null)
-            {
                 throw new ArgumentNullException(nameof(collection));
-            }
-
             foreach (var item in collection)
             {
                 destination.Add(item);
@@ -261,15 +89,9 @@ namespace FlaxEngine.Utilities
         public static void EnqueueRange<T>(this Queue<T> queue, IEnumerable<T> collection)
         {
             if (queue == null)
-            {
                 throw new ArgumentNullException(nameof(queue));
-            }
-
             if (collection == null)
-            {
                 throw new ArgumentNullException(nameof(collection));
-            }
-
             foreach (var item in collection)
             {
                 queue.Enqueue(item);
@@ -286,15 +108,9 @@ namespace FlaxEngine.Utilities
         public static void PushRange<T>(this Stack<T> stack, IEnumerable<T> collection)
         {
             if (stack == null)
-            {
                 throw new ArgumentNullException(nameof(stack));
-            }
-
             if (collection == null)
-            {
                 throw new ArgumentNullException(nameof(collection));
-            }
-
             foreach (var item in collection)
             {
                 stack.Push(item);
@@ -311,15 +127,9 @@ namespace FlaxEngine.Utilities
         public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
         {
             if (source == null)
-            {
                 throw new ArgumentNullException(nameof(source));
-            }
-
             if (action == null)
-            {
                 throw new ArgumentNullException(nameof(action));
-            }
-
             foreach (var item in source)
             {
                 action(item);
@@ -338,15 +148,9 @@ namespace FlaxEngine.Utilities
         public static T Choose<T>(this Random random, IList<T> collection)
         {
             if (random == null)
-            {
                 throw new ArgumentNullException(nameof(random));
-            }
-
             if (collection == null)
-            {
                 throw new ArgumentNullException(nameof(collection));
-            }
-
             return collection[random.Next(collection.Count)];
         }
 
@@ -362,15 +166,9 @@ namespace FlaxEngine.Utilities
         public static T Choose<T>(this Random random, params T[] collection)
         {
             if (random == null)
-            {
                 throw new ArgumentNullException(nameof(random));
-            }
-
             if (collection == null)
-            {
                 throw new ArgumentNullException(nameof(collection));
-            }
-
             return collection[random.Next(collection.Length)];
         }
 
@@ -404,5 +202,201 @@ namespace FlaxEngine.Utilities
                 collection[n] = value;
             }
         }
+
+        /// <summary>
+        /// Generates a random <see cref="bool"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="weight">Normalized value that determines the chance to return true.</param>
+        /// <returns>A <see cref="bool"/> thats either true or false.</returns>
+        public static bool NextBool(this Random random, float weight = 0.5f) => random.NextDouble() < weight;
+
+        /// <summary>
+        /// Generates a random <see cref="byte"/> value between min and max.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="byte"/> between min and max.</returns>
+        public static byte NextByte(this Random random, byte min = 0, byte max = byte.MaxValue)
+        {
+            return (byte)random.Next(min, max == byte.MaxValue ? byte.MaxValue + 1 : max);
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="float"/> value between min and max.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="float"/> between min and max.</returns>
+        public static float NextFloat(this Random random, float min = 0.0f, float max = 1.0f)
+        {
+            return (float)random.NextDouble() * (max - min) + min;
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="float"/>  value between 0 and max.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="float"/> between min and max.</returns>
+        public static float NextFloat(this Random random, float max)
+        {
+            return (float)random.NextDouble() * max;
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="Quaternion"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="randomRoll">Should the roll value be randomized.</param>
+        /// <returns>A random <see cref="Quaternion"/>.</returns>
+        public static Quaternion NextQuaternion(this Random random, bool randomRoll = false)
+        {
+            return Quaternion.Euler(NextFloat(random, -180.0f, 180.0f), NextFloat(random, -180.0f, 180.0f), randomRoll ? NextFloat(random, -180.0f, 180.0f) : 0.0f);
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="Vector2"/> point in a circle of a given radius.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="radius">Radius of circle. Default 1.0f./>.</param>
+        /// <returns>A random <see cref="Vector2"/>.</returns>
+        public static Vector2 NextUnitVector2(this Random random, float radius = 1.0f)
+        {
+            var randomRadius = (float)random.NextDouble() * radius;
+            return new Vector2((float)Math.Cos(random.NextDouble()) * randomRadius, (float)Math.Sin(random.NextDouble()) * randomRadius);
+        }
+
+        /// <summary>
+        /// Generates a uniformly distributed random unit length vector point on a unit sphere.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns>A random <see cref="Vector3"/>.</returns>
+        public static Vector3 NextUnitVector3(this Random random)
+        {
+            Vector3 output;
+            float l;
+
+            do
+            {
+                // Create random float with a mean of 0 and deviation of ±1
+                output.X = NextFloat(random) * 2.0f - 1.0f;
+                output.Y = NextFloat(random) * 2.0f - 1.0f;
+                output.Z = NextFloat(random) * 2.0f - 1.0f;
+
+                l = output.LengthSquared;
+            } while (l > 1 || l < Mathf.Epsilon);
+
+            output.Normalize();
+
+            return output;
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="Vector2"/> with components in a given range.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="Vector2"/>.</returns>
+        public static Vector2 NextVector2(this Random random, float min = 0.0f, float max = 1.0f)
+        {
+            return new Vector2(NextFloat(random, min, max), NextFloat(random, min, max));
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="Vector3"/> with components in a given range.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="Vector3"/>.</returns>
+        public static Vector3 NextVector3(this Random random, float min = 0.0f, float max = 1.0f)
+        {
+            return new Vector3(NextFloat(random, min, max), NextFloat(random, min, max), NextFloat(random, min, max));
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="Vector4"/> with components in a given range.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="Vector4"/>.</returns>
+        public static Vector4 NextVector4(this Random random, float min = 0.0f, float max = 1.0f)
+        {
+            return new Vector4(NextFloat(random, min, max), NextFloat(random, min, max), NextFloat(random, min, max), NextFloat(random, min, max));
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="Color"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="randomAlpha">Randomize the alpha value.</param>
+        /// <returns>A nice random <see cref="Color"/>.</returns>
+        public static Color NextColor(this Random random, bool randomAlpha = false)
+        {
+            return new Color(NextFloat(random), NextFloat(random), NextFloat(random), randomAlpha ? NextFloat(random) : 1.0f);
+        }
+
+        /// <summary>
+        /// Generates a random <see cref="ColorHSV"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="randomAlpha">Randomize the alpha value.</param>
+        /// <returns>A nice random <see cref="ColorHSV"/>.</returns>
+        public static ColorHSV NextColorHSV(this Random random, bool randomAlpha = false)
+        {
+            return new ColorHSV(NextFloat(random, 0.0f, 360.0f), 1.0f, 1.0f, randomAlpha ? NextFloat(random) : 1.0f);
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="double"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="min">The minimum value.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="double"/>.</returns>
+        public static double NextDouble(this Random random, double min = 0.0d, double max = 1.0d)
+        {
+            return random.NextDouble() * (max - min) + min;
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="double"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="max">The maximum value.</param>
+        /// <returns>A random <see cref="double"/>.</returns>
+        public static double NextDouble(this Random random, double max = 1.0d)
+        {
+            return random.NextDouble() * max;
+        }
+
+        /// <summary>
+        /// Gets a random <see cref="long"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns>A random <see cref="long"/>.</returns>
+        internal static long NextLong(this Random random)
+        {
+            var numArray = new byte[8];
+            random.NextBytes(numArray);
+            return (long)(BitConverter.ToUInt64(numArray, 0) & long.MaxValue);
+        }
+
+        /// <summary>
+        /// Returns a random value of the given enum.
+        /// </summary>
+        /// <typeparam name="TEnum">The enum to get the value from.</typeparam>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns>A random enum value.</returns>
+        public static TEnum NextEnum<TEnum>(this Random random)
+        {
+            Array values = Enum.GetValues(typeof(TEnum));
+            return (TEnum)values.GetValue(random.Next(values.Length));
+        }
     }
 }
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
index dc829912c..fd07f6d2c 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
@@ -437,6 +437,7 @@ namespace Flax.Build.Bindings
                 // Write documentation comment as tooltip
                 if (comment.Length >= 3 &&
                     comment[0] == "/// <summary>" &&
+                    comment[1].StartsWith("/// ") &&
                     comment[2] == "/// </summary>")
                 {
                     var tooltip = comment[1].Substring(4);
diff --git a/Source/Tools/Flax.Build/Log.cs b/Source/Tools/Flax.Build/Log.cs
index 3bd972f42..a382e7099 100644
--- a/Source/Tools/Flax.Build/Log.cs
+++ b/Source/Tools/Flax.Build/Log.cs
@@ -123,6 +123,58 @@ namespace Flax.Build
             Write(message, ConsoleColor.Red, true);
         }
 
+        /// <summary>
+        /// Logs the verbose message.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="flag">The flag used to indicate whether this log was already sent.</param>
+        public static void VerboseOnce(string message, ref bool flag)
+        {
+            if (flag)
+                return;
+            flag = true;
+            Write(message, _defaultColor, Configuration.ConsoleLog && Configuration.Verbose);
+        }
+
+        /// <summary>
+        /// Logs the information.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="flag">The flag used to indicate whether this log was already sent.</param>
+        public static void InfoOnce(string message, ref bool flag)
+        {
+            if (flag)
+                return;
+            flag = true;
+            Write(message, _defaultColor, Configuration.ConsoleLog);
+        }
+
+        /// <summary>
+        /// Logs the warning message.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="flag">The flag used to indicate whether this log was already sent.</param>
+        public static void WarningOnce(string message, ref bool flag)
+        {
+            if (flag)
+                return;
+            flag = true;
+            Write(message, ConsoleColor.Yellow, true);
+        }
+
+        /// <summary>
+        /// Logs the error message.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="flag">The flag used to indicate whether this log was already sent.</param>
+        public static void ErrorOnce(string message, ref bool flag)
+        {
+            if (flag)
+                return;
+            flag = true;
+            Write(message, ConsoleColor.Red, true);
+        }
+
         /// <summary>
         /// Logs the exception.
         /// </summary>
diff --git a/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs b/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
index d02f440ae..c8443729d 100644
--- a/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
+++ b/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
@@ -42,7 +42,19 @@ namespace Flax.Build.Platforms
                     var subdirs = Directory.GetDirectories(Path.Combine(AndroidSdk.Instance.RootPath, "ndk"));
                     if (subdirs.Length != 0)
                     {
-                        Array.Sort(subdirs, (a, b) => Version.Parse(Path.GetFileName(a)).CompareTo(Version.Parse(Path.GetFileName(b))));
+                        Array.Sort(subdirs, (a, b) =>
+                        {
+                            Version va, vb;
+                            if (Version.TryParse(a, out va))
+                            {
+                                if (Version.TryParse(b, out vb))
+                                    return va.CompareTo(vb);
+                                return 1;
+                            }
+                            if (Version.TryParse(b, out vb))
+                                return -1;
+                            return 0;
+                        });
                         sdkPath = subdirs.Last();
                     }
                 }
@@ -56,11 +68,14 @@ namespace Flax.Build.Platforms
                 var lines = File.ReadAllLines(Path.Combine(sdkPath, "source.properties"));
                 if (lines.Length > 1)
                 {
-                    RootPath = sdkPath;
                     var ver = lines[1].Substring(lines[1].IndexOf(" = ", StringComparison.Ordinal) + 2);
-                    Version = Version.Parse(ver);
-                    IsValid = true;
-                    Log.Info(string.Format("Found Android NDK {1} at {0}", RootPath, Version));
+                    if (Version.TryParse(ver, out var v))
+                    {
+                        RootPath = sdkPath;
+                        Version = v;
+                        IsValid = true;
+                        Log.Info(string.Format("Found Android NDK {1} at {0}", RootPath, Version));
+                    }
                 }
             }
         }
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
index 4b7f49712..88670c138 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
@@ -133,6 +133,8 @@ namespace Flax.Build.Projects.VisualStudio
 
             // Per configuration options
             var buildToolPath = Utilities.MakePathRelativeTo(typeof(Builder).Assembly.Location, projectDirectory);
+            var preprocessorDefinitions = new HashSet<string>();
+            var includePaths = new HashSet<string>();
             foreach (var configuration in project.Configurations)
             {
                 var platform = Platform.GetPlatform(configuration.Platform);
@@ -140,11 +142,11 @@ namespace Flax.Build.Projects.VisualStudio
                 var target = configuration.Target;
                 var targetBuildOptions = configuration.TargetBuildOptions;
 
-                var preprocessorDefinitions = new HashSet<string>();
+                preprocessorDefinitions.Clear();
                 foreach (var e in targetBuildOptions.CompileEnv.PreprocessorDefinitions)
                     preprocessorDefinitions.Add(e);
 
-                var includePaths = new HashSet<string>();
+                includePaths.Clear();
                 foreach (var e in targetBuildOptions.CompileEnv.IncludePaths)
                     includePaths.Add(e);