diff --git a/src/Kaleidoscope/TapDance.cpp b/src/Kaleidoscope/TapDance.cpp
index 76518fce..9716f9b2 100644
--- a/src/Kaleidoscope/TapDance.cpp
+++ b/src/Kaleidoscope/TapDance.cpp
@@ -18,7 +18,7 @@
 
 #include <Kaleidoscope-TapDance.h>
 
-using namespace KaleidoscopePlugins::Ranges;
+using KaleidoscopePlugins::Ranges;
 
 namespace KaleidoscopePlugins {
 // --- state ---
@@ -222,7 +222,7 @@ TapDance::loopHook (bool postClear) {
     if (endTime && millis () > endTime)
         timeout();
 }
-};
+} // namespace KaleidoscopePlugins
 
 __attribute__((weak))
 void
diff --git a/src/Kaleidoscope/TapDance.h b/src/Kaleidoscope/TapDance.h
index 4d1d0268..60cf8925 100644
--- a/src/Kaleidoscope/TapDance.h
+++ b/src/Kaleidoscope/TapDance.h
@@ -42,7 +42,7 @@ class TapDance : public KaleidoscopePlugin {
 
     TapDance (void);
 
-    virtual void begin (void) final;
+    void begin (void) final;
     static uint16_t timeOut;
 
     void actionKeys (uint8_t tapCount, ActionType tapDanceAction, uint8_t maxKeys, const Key tapKeys[]);
@@ -64,8 +64,8 @@ class TapDance : public KaleidoscopePlugin {
     static void interrupt (void);
     static void timeout (void);
     static Key release (uint8_t tapDanceIndex);
-};
-};
+}
+} // namespace KaleidoscopePlugins
 
 void tapDanceAction (uint8_t tapDanceIndex, byte row, byte col, uint8_t tapCount, KaleidoscopePlugins::TapDance::ActionType tapDanceAction);