diff --git a/src/app/core/platform/view_controller.h b/src/app/core/platform/view_controller.h
index 9396eb3f..81c640bd 100644
--- a/src/app/core/platform/view_controller.h
+++ b/src/app/core/platform/view_controller.h
@@ -12,7 +12,7 @@
 @interface AppViewController : UIViewController <MTKViewDelegate>
 @property(nonatomic) yaze::app::core::Controller *controller;
 @property(nonatomic) UIHoverGestureRecognizer *hoverGestureRecognizer;
-@property(notatomic) UIPinchGestureRecognizer *pinchRecognizer;
+@property(nontatomic) UIPinchGestureRecognizer *pinchRecognizer;
 @property(nonatomic) UISwipeGestureRecognizer *swipeRecognizer;
 @end
 #endif
diff --git a/src/app/editor/message/message_editor.h b/src/app/editor/message/message_editor.h
index 14e5bc1a..2392614d 100644
--- a/src/app/editor/message/message_editor.h
+++ b/src/app/editor/message/message_editor.h
@@ -23,28 +23,26 @@ namespace yaze {
 namespace app {
 namespace editor {
 
-// TEXT EDITOR RELATED CONSTANTS
-const int kGfxFont = 0x70000;  // 2bpp format
-const int kTextData = 0xE0000;
-const int kTextDataEnd = 0xE7FFF;
-const int kTextData2 = 0x75F40;
-const int kTextData2End = 0x773FF;
-const int kPointersDictionaries = 0x74703;
-const int kCharactersWidth = 0x74ADF;
+constexpr int kGfxFont = 0x70000;  // 2bpp format
+constexpr int kTextData = 0xE0000;
+constexpr int kTextDataEnd = 0xE7FFF;
+constexpr int kTextData2 = 0x75F40;
+constexpr int kTextData2End = 0x773FF;
+constexpr int kPointersDictionaries = 0x74703;
+constexpr int kCharactersWidth = 0x74ADF;
 constexpr int kNumDictionaryEntries = 97;
 
-const std::string DICTIONARYTOKEN = "D";
-const uint8_t DICTOFF = 0x88;
-const std::string BANKToken = "BANK";
-const uint8_t BANKID = 0x80;
-
 constexpr uint8_t kBlockTerminator = 0x80;
-
+constexpr uint8_t DICTOFF = 0x88;
+constexpr uint8_t BANKID = 0x80;
 constexpr uint8_t kScrollVertical = 0x73;
 constexpr uint8_t kLine1 = 0x74;
 constexpr uint8_t kLine2 = 0x75;
 constexpr uint8_t kLine3 = 0x76;
 
+const std::string DICTIONARYTOKEN = "D";
+const std::string BANKToken = "BANK";
+
 static const TextElement TextCommands[] = {
     TextElement(0x6B, "W", true, "Window border"),
     TextElement(0x6D, "P", true, "Window position"),
diff --git a/src/app/editor/settings_editor.cc b/src/app/editor/settings_editor.cc
index 3539419a..d93658eb 100644
--- a/src/app/editor/settings_editor.cc
+++ b/src/app/editor/settings_editor.cc
@@ -3,7 +3,6 @@
 
 #include "absl/status/status.h"
 #include "app/editor/utils/flags.h"
-#include "app/editor/utils/keyboard_shortcuts.h"
 #include "app/editor/settings_editor.h"
 #include "app/editor/utils/flags.h"
 
diff --git a/src/app/editor/utils/keyboard_shortcuts.h b/src/app/editor/utils/keyboard_shortcuts.h
deleted file mode 100644
index bb70ccf7..00000000
--- a/src/app/editor/utils/keyboard_shortcuts.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
-#define YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
-
-#include "imgui/imgui.h"
-
-namespace yaze {
-namespace app {
-namespace editor {
-
-struct KeyboardShortcuts {
-  enum class ShortcutType {
-    kCut,
-    kCopy,
-    kPaste,
-    kUndo,
-    kRedo,
-    kFind,
-  };
-};
-
-}  // namespace editor
-}  // namespace app
-}  // namespace yaze
-
-#endif  // YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H_