diff --git a/bakara/src/bakara/core/log.h b/bakara/src/bakara/core/log.h
index 3ede07b..1e53a3f 100644
--- a/bakara/src/bakara/core/log.h
+++ b/bakara/src/bakara/core/log.h
@@ -19,18 +19,29 @@ namespace Bk {
             static std::shared_ptr<spdlog::logger> p_core_logger;
             static std::shared_ptr<spdlog::logger> p_app_logger;
 	};
+    #ifdef BK_DEBUG
+        #define BK_CORE_TRACE(...)    ::Bk::Log::get_core_logger()->trace(__VA_ARGS__)
+        #define BK_CORE_INFO(...)     ::Bk::Log::get_core_logger()->info(__VA_ARGS__)
+        #define BK_CORE_WARN(...)     ::Bk::Log::get_core_logger()->warn(__VA_ARGS__)
+        #define BK_CORE_ERROR(...)    ::Bk::Log::get_core_logger()->error(__VA_ARGS__)
+        #define BK_CORE_CRITICAL(...) ::Bk::Log::get_core_logger()->critical(__VA_ARGS__)
 
-    #define BK_CORE_TRACE(...)    ::Bk::Log::get_core_logger()->trace(__VA_ARGS__)
-    #define BK_CORE_INFO(...)     ::Bk::Log::get_core_logger()->info(__VA_ARGS__)
-    #define BK_CORE_WARN(...)     ::Bk::Log::get_core_logger()->warn(__VA_ARGS__)
-    #define BK_CORE_ERROR(...)    ::Bk::Log::get_core_logger()->error(__VA_ARGS__)
-    #define BK_CORE_CRITICAL(...) ::Bk::Log::get_core_logger()->critical(__VA_ARGS__)
-
-    // Client log macros
-    #define BK_TRACE(...)         ::Bk::Log::get_app_logger()->trace(__VA_ARGS__)
-    #define BK_INFO(...)          ::Bk::Log::get_app_logger()->info(__VA_ARGS__)
-    #define BK_WARN(...)          ::Bk::Log::get_app_logger()->warn(__VA_ARGS__)
-    #define BK_ERROR(...)         ::Bk::Log::get_app_logger()->error(__VA_ARGS__)
-    #define BK_CRITICAL(...)      ::Bk::Log::get_app_logger()->critical(__VA_ARGS__)
+        #define BK_TRACE(...)         ::Bk::Log::get_app_logger()->trace(__VA_ARGS__)
+        #define BK_INFO(...)          ::Bk::Log::get_app_logger()->info(__VA_ARGS__)
+        #define BK_WARN(...)          ::Bk::Log::get_app_logger()->warn(__VA_ARGS__)
+        #define BK_ERROR(...)         ::Bk::Log::get_app_logger()->error(__VA_ARGS__)
+        #define BK_CRITICAL(...)      ::Bk::Log::get_app_logger()->critical(__VA_ARGS__)
+    #else
+        #define BK_CORE_TRACE(...)    
+        #define BK_CORE_INFO(...)     
+        #define BK_CORE_WARN(...)     
+        #define BK_CORE_ERROR(...)    
+        #define BK_CORE_CRITICAL(...) 
 
+        #define BK_TRACE(...)         
+        #define BK_INFO(...)          
+        #define BK_WARN(...)          
+        #define BK_ERROR(...)         
+        #define BK_CRITICAL(...)       
+    #endif
 }
\ No newline at end of file
diff --git a/bakara/src/bakara/events/event.h b/bakara/src/bakara/events/event.h
index d583edc..0d8c251 100644
--- a/bakara/src/bakara/events/event.h
+++ b/bakara/src/bakara/events/event.h
@@ -61,13 +61,10 @@ namespace Bk {
             virtual EventType get_event_type() const = 0;
             virtual const char* get_name() const = 0;
             virtual int get_category_flags() const = 0;
-            
+        #ifdef BK_DEBUG
             virtual std::string to_string() const { return get_name(); }
-
-            bool is_in_category(EventCategory category)
-            {
-                return get_category_flags() & category;
-            }
+        #endif
+            bool is_in_category(EventCategory category) { return get_category_flags() & category; }
     };
 
 	class EventDispatcher
@@ -87,6 +84,8 @@ namespace Bk {
                 }
                 return false;
             }
+
+            inline Event& get_event() { return p_event; }
         private:
             Event& p_event;
 	};