diff --git a/code/Runtime/Target/CommandEvent.cpp b/code/Runtime/Target/CommandEvent.cpp
index 06e674371b..2641a22554 100644
--- a/code/Runtime/Target/CommandEvent.cpp
+++ b/code/Runtime/Target/CommandEvent.cpp
@@ -1,23 +1,21 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/CommandEvent.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
+#include "Runtime/Target/CommandEvent.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.CommandEvent", 0, CommandEvent, IRemoteEvent)
 
-CommandEvent::CommandEvent(const std::wstring& function)
+CommandEvent::CommandEvent(const std::wstring_view& function)
 :	m_function(function)
 {
 }
@@ -32,5 +30,4 @@ void CommandEvent::serialize(ISerializer& s)
 	s >> Member< std::wstring >(L"function", m_function);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/CommandEvent.h b/code/Runtime/Target/CommandEvent.h
index 3b95328249..7e7929c0fd 100644
--- a/code/Runtime/Target/CommandEvent.h
+++ b/code/Runtime/Target/CommandEvent.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Application generic command events.
  * \ingroup Runtime
@@ -37,7 +35,7 @@ class T_DLLCLASS CommandEvent : public IRemoteEvent
 public:
 	CommandEvent() = default;
 
-	explicit CommandEvent(const std::wstring& function);
+	explicit CommandEvent(const std::wstring_view& function);
 
 	const std::wstring& getFunction() const;
 
@@ -47,5 +45,4 @@ class T_DLLCLASS CommandEvent : public IRemoteEvent
 	std::wstring m_function;
 };
 
-	}
 }
diff --git a/code/Runtime/Target/IRemoteEvent.cpp b/code/Runtime/Target/IRemoteEvent.cpp
index d70d138369..bcf080fe02 100644
--- a/code/Runtime/Target/IRemoteEvent.cpp
+++ b/code/Runtime/Target/IRemoteEvent.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,12 +8,9 @@
  */
 #include "Runtime/Target/IRemoteEvent.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.runtime.IRemoteEvent", IRemoteEvent, ISerializable)
 
-	}
 }
diff --git a/code/Runtime/Target/IRemoteEvent.h b/code/Runtime/Target/IRemoteEvent.h
index f303fbca80..ef55e7e3b6 100644
--- a/code/Runtime/Target/IRemoteEvent.h
+++ b/code/Runtime/Target/IRemoteEvent.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,12 +18,10 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
-/*! \brief
+/*!
  * \ingroup Runtime
  */
 class T_DLLCLASS IRemoteEvent : public ISerializable
@@ -31,6 +29,4 @@ class T_DLLCLASS IRemoteEvent : public ISerializable
 	T_RTTI_CLASS;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerBreadcrumbs.cpp b/code/Runtime/Target/ScriptDebuggerBreadcrumbs.cpp
index 79eac6fd04..e8f1527a70 100644
--- a/code/Runtime/Target/ScriptDebuggerBreadcrumbs.cpp
+++ b/code/Runtime/Target/ScriptDebuggerBreadcrumbs.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerBreadcrumbs.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberAlignedVector.h"
+#include "Runtime/Target/ScriptDebuggerBreadcrumbs.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerBreadcrumbs", 0, ScriptDebuggerBreadcrumbs, ISerializable)
 
@@ -27,5 +25,4 @@ void ScriptDebuggerBreadcrumbs::serialize(ISerializer& s)
 	s >> MemberAlignedVector< uint32_t >(L"breadcrumbs", m_breadcrumbs);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerBreadcrumbs.h b/code/Runtime/Target/ScriptDebuggerBreadcrumbs.h
index aad675e43f..4aad253d42 100644
--- a/code/Runtime/Target/ScriptDebuggerBreadcrumbs.h
+++ b/code/Runtime/Target/ScriptDebuggerBreadcrumbs.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,17 +19,15 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 class Variable;
 
-	}
+}
 
-	namespace runtime
-	{
+namespace traktor::runtime
+{
 
 /*! Response from running target when breadcrumbs has been captured.
  * \ingroup Runtime
@@ -51,6 +49,4 @@ class T_DLLCLASS ScriptDebuggerBreadcrumbs : public ISerializable
 	AlignedVector< uint32_t > m_breadcrumbs;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerBreakpoint.cpp b/code/Runtime/Target/ScriptDebuggerBreakpoint.cpp
index d14c8a88bb..2ee4ce20ac 100644
--- a/code/Runtime/Target/ScriptDebuggerBreakpoint.cpp
+++ b/code/Runtime/Target/ScriptDebuggerBreakpoint.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerBreakpoint.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
+#include "Runtime/Target/ScriptDebuggerBreakpoint.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerBreakpoint", 0, ScriptDebuggerBreakpoint, ISerializable)
 
@@ -31,5 +29,4 @@ void ScriptDebuggerBreakpoint::serialize(ISerializer& s)
 	s >> Member< uint32_t >(L"lineNumber", m_lineNumber);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerBreakpoint.h b/code/Runtime/Target/ScriptDebuggerBreakpoint.h
index 26ee3ed494..4fd30ece54 100644
--- a/code/Runtime/Target/ScriptDebuggerBreakpoint.h
+++ b/code/Runtime/Target/ScriptDebuggerBreakpoint.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Add or remove script breakpoint on running target.
  * \ingroup Runtime
@@ -50,6 +48,4 @@ class T_DLLCLASS ScriptDebuggerBreakpoint : public ISerializable
 	uint32_t m_lineNumber = 0;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerControl.cpp b/code/Runtime/Target/ScriptDebuggerControl.cpp
index b4e046d5e8..402e244545 100644
--- a/code/Runtime/Target/ScriptDebuggerControl.cpp
+++ b/code/Runtime/Target/ScriptDebuggerControl.cpp
@@ -1,20 +1,18 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerControl.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
 #include "Core/Serialization/MemberEnum.h"
+#include "Runtime/Target/ScriptDebuggerControl.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerControl", 0, ScriptDebuggerControl, ISerializable)
 
@@ -36,5 +34,4 @@ void ScriptDebuggerControl::serialize(ISerializer& s)
 	s >> Member< uint32_t >(L"param", m_param);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerControl.h b/code/Runtime/Target/ScriptDebuggerControl.h
index 5e4b5e8630..598cee2056 100644
--- a/code/Runtime/Target/ScriptDebuggerControl.h
+++ b/code/Runtime/Target/ScriptDebuggerControl.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Control debugger on running target.
  * \ingroup Runtime
@@ -61,6 +59,4 @@ class T_DLLCLASS ScriptDebuggerControl : public ISerializable
 	uint32_t m_param = 0;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerLocals.cpp b/code/Runtime/Target/ScriptDebuggerLocals.cpp
index 91fe408290..66bec8b6f3 100644
--- a/code/Runtime/Target/ScriptDebuggerLocals.cpp
+++ b/code/Runtime/Target/ScriptDebuggerLocals.cpp
@@ -1,20 +1,18 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerLocals.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberRefArray.h"
+#include "Runtime/Target/ScriptDebuggerLocals.h"
 #include "Script/Variable.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerLocals", 0, ScriptDebuggerLocals, ISerializable)
 
@@ -28,5 +26,4 @@ void ScriptDebuggerLocals::serialize(ISerializer& s)
 	s >> MemberRefArray< script::Variable >(L"locals", m_locals);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerLocals.h b/code/Runtime/Target/ScriptDebuggerLocals.h
index b92a0b26f2..9921dfebd7 100644
--- a/code/Runtime/Target/ScriptDebuggerLocals.h
+++ b/code/Runtime/Target/ScriptDebuggerLocals.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,17 +19,15 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 class Variable;
 
-	}
+}
 
-	namespace runtime
-	{
+namespace traktor::runtime
+{
 
 /*! Response from running target when locals has been captured.
  * \ingroup Runtime
@@ -51,6 +49,4 @@ class T_DLLCLASS ScriptDebuggerLocals : public ISerializable
 	RefArray< script::Variable > m_locals;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerStackFrame.cpp b/code/Runtime/Target/ScriptDebuggerStackFrame.cpp
index 4607cf1354..bf8d9c0a92 100644
--- a/code/Runtime/Target/ScriptDebuggerStackFrame.cpp
+++ b/code/Runtime/Target/ScriptDebuggerStackFrame.cpp
@@ -1,20 +1,18 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerStackFrame.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberRef.h"
+#include "Runtime/Target/ScriptDebuggerStackFrame.h"
 #include "Script/StackFrame.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerStackFrame", 0, ScriptDebuggerStackFrame, ISerializable)
 
@@ -28,5 +26,4 @@ void ScriptDebuggerStackFrame::serialize(ISerializer& s)
 	s >> MemberRef< script::StackFrame >(L"frame", m_frame);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerStackFrame.h b/code/Runtime/Target/ScriptDebuggerStackFrame.h
index fcc1a7a466..99e25bb32e 100644
--- a/code/Runtime/Target/ScriptDebuggerStackFrame.h
+++ b/code/Runtime/Target/ScriptDebuggerStackFrame.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,17 +19,15 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 class StackFrame;
 
-	}
+}
 
-	namespace runtime
-	{
+namespace traktor::runtime
+{
 
 /*! Response from running target when a stack frame has been captured.
  * \ingroup Runtime
@@ -51,6 +49,4 @@ class T_DLLCLASS ScriptDebuggerStackFrame : public ISerializable
 	Ref< script::StackFrame > m_frame;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerStateChange.cpp b/code/Runtime/Target/ScriptDebuggerStateChange.cpp
index 1fb448fa1a..5594655dd1 100644
--- a/code/Runtime/Target/ScriptDebuggerStateChange.cpp
+++ b/code/Runtime/Target/ScriptDebuggerStateChange.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerStateChange.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
+#include "Runtime/Target/ScriptDebuggerStateChange.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerStateChange", 0, ScriptDebuggerStateChange, ISerializable)
 
@@ -27,5 +25,4 @@ void ScriptDebuggerStateChange::serialize(ISerializer& s)
 	s >> Member< bool >(L"running", m_running);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerStateChange.h b/code/Runtime/Target/ScriptDebuggerStateChange.h
index d79e0b38b7..cc357883db 100644
--- a/code/Runtime/Target/ScriptDebuggerStateChange.h
+++ b/code/Runtime/Target/ScriptDebuggerStateChange.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Event from target when debug state has changed.
  * \ingroup Runtime
@@ -43,6 +41,4 @@ class T_DLLCLASS ScriptDebuggerStateChange : public ISerializable
 	bool m_running = false;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptDebuggerStatus.cpp b/code/Runtime/Target/ScriptDebuggerStatus.cpp
index 39caa069a6..e09a6db423 100644
--- a/code/Runtime/Target/ScriptDebuggerStatus.cpp
+++ b/code/Runtime/Target/ScriptDebuggerStatus.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/ScriptDebuggerStatus.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
+#include "Runtime/Target/ScriptDebuggerStatus.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptDebuggerStatus", 0, ScriptDebuggerStatus, ISerializable)
 
@@ -27,5 +25,4 @@ void ScriptDebuggerStatus::serialize(ISerializer& s)
 	s >> Member< bool >(L"running", m_running);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptDebuggerStatus.h b/code/Runtime/Target/ScriptDebuggerStatus.h
index 4332977634..ae29f0270f 100644
--- a/code/Runtime/Target/ScriptDebuggerStatus.h
+++ b/code/Runtime/Target/ScriptDebuggerStatus.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Debugger status response.
  * \ingroup Runtime
@@ -43,6 +41,4 @@ class T_DLLCLASS ScriptDebuggerStatus : public ISerializable
 	bool m_running = false;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/ScriptProfilerCallMeasured.cpp b/code/Runtime/Target/ScriptProfilerCallMeasured.cpp
index 77458b42ea..de73cb9023 100644
--- a/code/Runtime/Target/ScriptProfilerCallMeasured.cpp
+++ b/code/Runtime/Target/ScriptProfilerCallMeasured.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,8 @@
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.ScriptProfilerCallMeasured", 0, ScriptProfilerCallMeasured, ISerializable)
 
@@ -35,5 +33,4 @@ void ScriptProfilerCallMeasured::serialize(ISerializer& s)
 	s >> Member< double >(L"exclusiveDuration", m_exclusiveDuration);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/ScriptProfilerCallMeasured.h b/code/Runtime/Target/ScriptProfilerCallMeasured.h
index 93b705d202..d989f92937 100644
--- a/code/Runtime/Target/ScriptProfilerCallMeasured.h
+++ b/code/Runtime/Target/ScriptProfilerCallMeasured.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Script profiler measurement from running target.
  * \ingroup Runtime
@@ -56,6 +54,4 @@ class T_DLLCLASS ScriptProfilerCallMeasured : public ISerializable
 	double m_exclusiveDuration = 0.0;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/TargetID.cpp b/code/Runtime/Target/TargetID.cpp
index 594a1bde97..d89fe2c9da 100644
--- a/code/Runtime/Target/TargetID.cpp
+++ b/code/Runtime/Target/TargetID.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,8 @@
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.TargetID", 0, TargetID, ISerializable)
 
@@ -39,5 +37,4 @@ void TargetID::serialize(ISerializer& s)
 	s >> Member< std::wstring >(L"name", m_name);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/TargetID.h b/code/Runtime/Target/TargetID.h
index a75c1ea260..e765e79445 100644
--- a/code/Runtime/Target/TargetID.h
+++ b/code/Runtime/Target/TargetID.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Running target identification.
  * \ingroup Runtime
@@ -47,6 +45,4 @@ class T_DLLCLASS TargetID : public ISerializable
 	std::wstring m_name;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/TargetLog.cpp b/code/Runtime/Target/TargetLog.cpp
index 908f4a5e3b..f326a92a61 100644
--- a/code/Runtime/Target/TargetLog.cpp
+++ b/code/Runtime/Target/TargetLog.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/TargetLog.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
+#include "Runtime/Target/TargetLog.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.TargetLog", 0, TargetLog, ISerializable)
 
@@ -31,5 +29,4 @@ void TargetLog::serialize(ISerializer& s)
 	s >> Member< std::wstring >(L"text", m_text);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/TargetLog.h b/code/Runtime/Target/TargetLog.h
index 263b5917f5..d6ff7f236e 100644
--- a/code/Runtime/Target/TargetLog.h
+++ b/code/Runtime/Target/TargetLog.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Log statement from running target.
  * \ingroup Runtime
@@ -50,6 +48,4 @@ class T_DLLCLASS TargetLog : public ISerializable
 	std::wstring m_text;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/TargetManagerConnection.cpp b/code/Runtime/Target/TargetManagerConnection.cpp
index a87316e84f..c59646e442 100644
--- a/code/Runtime/Target/TargetManagerConnection.cpp
+++ b/code/Runtime/Target/TargetManagerConnection.cpp
@@ -1,32 +1,30 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/TargetID.h"
-#include "Runtime/Target/TargetLog.h"
-#include "Runtime/Target/TargetManagerConnection.h"
 #include "Core/Log/Log.h"
 #include "Core/System/OS.h"
 #include "Net/BidirectionalObjectTransport.h"
 #include "Net/Network.h"
 #include "Net/SocketAddressIPv4.h"
 #include "Net/TcpSocket.h"
+#include "Runtime/Target/TargetID.h"
+#include "Runtime/Target/TargetLog.h"
+#include "Runtime/Target/TargetManagerConnection.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
+	namespace
 	{
-		namespace
-		{
 
 class LogRedirect : public ILogTarget
 {
 public:
-	LogRedirect(
+	explicit LogRedirect(
 		ILogTarget* originalTarget,
 		net::BidirectionalObjectTransport* transport
 	)
@@ -52,7 +50,7 @@ class LogRedirect : public ILogTarget
 	Ref< net::BidirectionalObjectTransport > m_transport;
 };
 
-		}
+	}
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.runtime.TargetManagerConnection", TargetManagerConnection, Object)
 
@@ -110,5 +108,4 @@ bool TargetManagerConnection::update()
 	return true;
 }
 
-	}
 }
diff --git a/code/Runtime/Target/TargetManagerConnection.h b/code/Runtime/Target/TargetManagerConnection.h
index bdf6782992..c997a50ec1 100644
--- a/code/Runtime/Target/TargetManagerConnection.h
+++ b/code/Runtime/Target/TargetManagerConnection.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,17 +20,15 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::net
 {
-	namespace net
-	{
 
 class BidirectionalObjectTransport;
 
-	}
+}
 
-	namespace runtime
-	{
+namespace traktor::runtime
+{
 
 /*! Application target manager connection.
  * \ingroup Runtime
@@ -52,6 +50,4 @@ class T_DLLCLASS TargetManagerConnection : public Object
 	Ref< net::BidirectionalObjectTransport > m_transport;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/TargetProfilerDictionary.cpp b/code/Runtime/Target/TargetProfilerDictionary.cpp
index d2a140a431..28b010266d 100644
--- a/code/Runtime/Target/TargetProfilerDictionary.cpp
+++ b/code/Runtime/Target/TargetProfilerDictionary.cpp
@@ -1,19 +1,17 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/TargetProfilerDictionary.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberSmallMap.h"
+#include "Runtime/Target/TargetProfilerDictionary.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.TargetProfilerDictionary", 0, TargetProfilerDictionary, ISerializable)
 
@@ -27,5 +25,4 @@ void TargetProfilerDictionary::serialize(ISerializer& s)
 	s >> MemberSmallMap< uint16_t, std::wstring >(L"dictionary", m_dictionary);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/TargetProfilerDictionary.h b/code/Runtime/Target/TargetProfilerDictionary.h
index 0c2c839ef4..7a169ede5b 100644
--- a/code/Runtime/Target/TargetProfilerDictionary.h
+++ b/code/Runtime/Target/TargetProfilerDictionary.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,10 +20,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Target profiler dictionary from running target.
  * \ingroup Runtime
@@ -45,6 +43,4 @@ class T_DLLCLASS TargetProfilerDictionary : public ISerializable
 	SmallMap< uint16_t, std::wstring > m_dictionary;
 };
 
-	}
 }
-
diff --git a/code/Runtime/Target/TargetProfilerEvents.cpp b/code/Runtime/Target/TargetProfilerEvents.cpp
index 3e6409130d..7d11cbd0ee 100644
--- a/code/Runtime/Target/TargetProfilerEvents.cpp
+++ b/code/Runtime/Target/TargetProfilerEvents.cpp
@@ -1,21 +1,19 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Runtime/Target/TargetProfilerEvents.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberStaticVector.h"
+#include "Runtime/Target/TargetProfilerEvents.h"
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
+	namespace
 	{
-		namespace
-		{
 
 class MemberProfilerEvent : public MemberComplex
 {
@@ -39,7 +37,7 @@ class MemberProfilerEvent : public MemberComplex
 	Profiler::Event& m_ref;
 };
 
-		}
+	}
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.runtime.TargetProfilerEvents", 0, TargetProfilerEvents, ISerializable)
 
@@ -55,5 +53,4 @@ void TargetProfilerEvents::serialize(ISerializer& s)
 	s >> MemberStaticVector< Profiler::Event, Profiler::MaxQueuedEvents, MemberProfilerEvent >(L"events", m_events);
 }
 
-	}
 }
diff --git a/code/Runtime/Target/TargetProfilerEvents.h b/code/Runtime/Target/TargetProfilerEvents.h
index a2a5bc0fbf..0cdbd2d82c 100644
--- a/code/Runtime/Target/TargetProfilerEvents.h
+++ b/code/Runtime/Target/TargetProfilerEvents.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::runtime
 {
-	namespace runtime
-	{
 
 /*! Target profiler events from running target.
  * \ingroup Runtime
@@ -47,6 +45,4 @@ class T_DLLCLASS TargetProfilerEvents : public ISerializable
 	Profiler::eventQueue_t m_events;
 };
 
-	}
 }
-