diff --git a/layouts/community/60_ansi/stanrc85-ansi/config.h b/layouts/community/60_ansi/stanrc85-ansi/config.h
index 77f0b2e7294..904a7f524e1 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/config.h
+++ b/layouts/community/60_ansi/stanrc85-ansi/config.h
@@ -2,5 +2,3 @@
 
 #define TAPPING_TERM 200
 #define RETRO_TAPPING
-
-//#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index e56078a971d..796882bea33 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -15,11 +15,10 @@
  */
 #include QMK_KEYBOARD_H
 
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
 #define DEFAULT 0 	//Custom ANSI
-#define LAYER1 1 	//Default ANSI (enable with Fn2+D)
-#define LAYER2 2 	//F keys, arrows, custom shortcuts, volume control
-#define LAYER3 3 	//Backlight controls and RESET
+#define LAYER1 1 	  //Default ANSI (enable with Fn2+D)
+#define LAYER2 2 	  //Function keys, arrows, custom shortcuts, volume control
+#define LAYER3 3 	  //Backlight controls and RESET
 
 #define KC_CAD	LALT(LCTL(KC_DEL))
 #define KC_LOCK	LGUI(KC_L)
@@ -31,38 +30,38 @@ enum {
 };
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-	[TD_WIN]  = ACTION_TAP_DANCE_DOUBLE(KC_CAD, KC_LOCK),
+	[TD_WIN] = ACTION_TAP_DANCE_DOUBLE(KC_CAD, KC_LOCK),
 	[TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRV)
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(
-		TD(TD_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-		LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT, LT(2, KC_SPC), KC_RALT, TD(TD_WIN), MO(3), KC_RCTL),
+		TD(TD_ESC),    KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,        KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,       KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		LT(2, KC_ESC), KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,       KC_SCLN, KC_QUOT, KC_ENT,
+		KC_LSFT,       KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,     KC_SLSH, KC_RSFT,
+		KC_LCTL,       KC_LGUI, KC_LALT,    LT(2, KC_SPC),          KC_RALT, TD(TD_WIN), MO(3),   KC_RCTL),
 
 	[1] = LAYOUT_60_ansi(
-		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-		KC_TAB,KC_Q,KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, MO(2), MO(3), KC_RCTL),
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC ,          KC_RALT, MO(2),  MO(3),   KC_RCTL),
 
 	[2] = LAYOUT_60_ansi(
-		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-		_______, _______, LCA(KC_QUOT), KC_VOLU, LCA(KC_SCLN), _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, _______, RESET,
-		KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______),
+		KC_TILD, KC_F1,   KC_F2,        KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+		_______, _______, LCA(KC_QUOT), KC_VOLU, LCA(KC_SCLN), _______, _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, RESET,
+		KC_CAPS, _______, KC_MUTE,      KC_VOLD, KC_MPLY,      _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
+		_______, _______, _______,      _______, _______,      _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______,                             _______,                        _______, _______, _______, _______)
 
 	[3] = LAYOUT_60_ansi(
-		RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-		KC_CAPS, _______, _______, TG(1), _______, _______, BL_STEP, BL_DEC, BL_INC, BL_TOGG, _______, _______, _______,
+		KC_CAPS, _______, _______, TG(1),   _______, _______, BL_STEP, BL_DEC,  BL_INC,  BL_TOGG, _______, _______, _______,
 		_______, _______, _______, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, RGB_MOD, RGB_TOG, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______)
+		_______, _______, _______,                   _______,                   _______, _______, _______, _______)
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/layouts/community/60_ansi/stanrc85-ansi/rules.mk b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
index e5ddcae8d92..d58c21f2b91 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/rules.mk
+++ b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
@@ -1 +1,2 @@
 TAP_DANCE_ENABLE = yes
+COMMAND_ENABLE = no