diff --git a/right/src/config/parse_keymap.c b/right/src/config/parse_keymap.c
index 5d1ea7a..b2a4898 100644
--- a/right/src/config/parse_keymap.c
+++ b/right/src/config/parse_keymap.c
@@ -28,21 +28,15 @@ static parser_error_t parseKeyStrokeAction(key_action_t *keyAction, uint8_t keyS
         default:
             return ParserError_InvalidSerializedKeystrokeType;
     }
-    if (keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_SCANCODE) {
-        keyAction->keystroke.scancode = keystrokeType == SerializedKeystrokeType_LongMedia ? readUInt16(buffer) : readUInt8(buffer);
-    } else {
-        keyAction->keystroke.scancode = 0;
-    }
-    if (keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_MODIFIERS) {
-        keyAction->keystroke.modifiers = readUInt8(buffer);
-    } else {
-        keyAction->keystroke.modifiers = 0;
-    }
-    if (keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_LONGPRESS) {
-        keyAction->keystroke.longPressAction = readUInt8(buffer);
-    } else {
-        keyAction->keystroke.longPressAction = 0;
-    }
+    keyAction->keystroke.scancode = keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_SCANCODE
+        ? keystrokeType == SerializedKeystrokeType_LongMedia ? readUInt16(buffer) : readUInt8(buffer)
+        : 0;
+    keyAction->keystroke.modifiers = keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_MODIFIERS
+        ? readUInt8(buffer)
+        : 0;
+    keyAction->keystroke.longPressAction = keyStrokeAction & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_LONGPRESS
+        ? readUInt8(buffer)
+        : 0;
     return ParserError_Success;
 }