diff --git a/common/action.c b/common/action.c
index f6e50032e..6d5336752 100644
--- a/common/action.c
+++ b/common/action.c
@@ -816,18 +816,18 @@ bool is_tap_key(key_t key)
         case ACT_LAYER:
         case ACT_LAYER_BIT:
             switch (action.layer.code) {
-                case 0x00:
-                case 0xF1 ... 0xFF:
+                case LAYER_MOMENTARY:
+                case LAYER_ON_PRESS:
+                case LAYER_ON_RELEASE:
+                case LAYER_DEFAULT:
                     return false;
-                case 0xF0:
-                default:
+                case LAYER_TAP_TOGGLE:
+                default:    /* tap key */
                     return true;
             }
             return false;
         case ACT_FUNCTION:
-            if (action.func.opt & FUNC_TAP) {
-                return true;
-            }
+            if (action.func.opt & FUNC_TAP) { return true; }
             return false;
     }
     return false;
diff --git a/common/action.h b/common/action.h
index 800554eb8..9b559cb18 100644
--- a/common/action.h
+++ b/common/action.h
@@ -323,7 +323,7 @@ enum usage_pages {
 
 /* Function */
 enum function_opts {
-    FUNC_TAP        = 0x8,
+    FUNC_TAP        = 0x8,      /* indciates function is tappable */
 };
 #define ACTION_FUNCTION(id, opt)        ACTION(ACT_FUNCTION, (opt)<<8 | id)
 #define ACTION_FUNCTION_TAP(id)         ACTION(ACT_FUNCTION, FUNC_TAP<<8 | id)