diff --git a/examples/opcUA_server/opcUA_server.ino b/examples/opcUA_server/opcUA_server.ino
index 85a3241..1a1930e 100644
--- a/examples/opcUA_server/opcUA_server.ino
+++ b/examples/opcUA_server/opcUA_server.ino
@@ -60,17 +60,21 @@ extern "C"
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-UA_Server * opc_ua_server = nullptr;
-
 static size_t const OPC_UA_SERVER_THREAD_STACK_SIZE = 16*1024UL;
 template <size_t SIZE> struct alignas(uint32_t) OPC_UA_STACK final : public std::array<uint8_t, SIZE> {};
 static OPC_UA_STACK<OPC_UA_SERVER_THREAD_STACK_SIZE> OPC_UA_SERVER_THREAD_STACK;
-rtos::Thread opc_ua_server_thread(osPriorityNormal, OPC_UA_SERVER_THREAD_STACK.size(), OPC_UA_SERVER_THREAD_STACK.data());
 
 static size_t const OPC_UA_SERVER_THREAD_HEAP_SIZE = 256*1024UL;
 template <size_t SIZE> struct alignas(O1HEAP_ALIGNMENT) OPC_UA_HEAP final : public std::array<uint8_t, SIZE> {};
 static OPC_UA_HEAP<OPC_UA_SERVER_THREAD_HEAP_SIZE> OPC_UA_SERVER_THREAD_HEAP;
+
+UA_Server * opc_ua_server = nullptr;
 O1HeapInstance * o1heap_ins = nullptr;
+rtos::Thread opc_ua_server_thread(osPriorityNormal, OPC_UA_SERVER_THREAD_STACK.size(), OPC_UA_SERVER_THREAD_STACK.data());
+
+/**************************************************************************************
+ * DEFINES
+ **************************************************************************************/
 
 REDIRECT_STDOUT_TO(Serial)