diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp
index 785b8cbd9..59500f945 100644
--- a/src/blackmisc/input/keyboardkey.cpp
+++ b/src/blackmisc/input/keyboardkey.cpp
@@ -31,12 +31,12 @@ namespace BlackMisc
 
         QString CKeyboardKey::convertToQString(bool /* i18n */) const
         {
-            return getKeyAsString();
+            return this->getKeyAsString();
         }
 
         void CKeyboardKey::setKeyObject(CKeyboardKey key)
         {
-            this->m_keyCode = key.m_keyCode;
+            m_keyCode = key.m_keyCode;
         }
 
         QString CKeyboardKey::getKeyAsString() const
@@ -90,15 +90,12 @@ namespace BlackMisc
         CVariant CKeyboardKey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
             if (index.isMyself()) { return CVariant::from(*this); }
-            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
-            case IndexKey:
-                return CVariant::from(this->m_keyCode);
-            case IndexKeyAsString:
-                return CVariant::from(getKeyAsString());
-            default:
-                break;
+            case IndexKey: return CVariant::from(m_keyCode);
+            case IndexKeyAsString: return CVariant::from(getKeyAsString());
+            default: break;
             }
 
             Q_ASSERT_X(false, "CKeyboardKey", "index unknown");
@@ -124,5 +121,5 @@ namespace BlackMisc
                 break;
             }
         }
-    } // namespace Hardware
-} // BlackMisc
+    } // ns
+} // ns
diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h
index df90ef89d..a84dea0e2 100644
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -46,19 +46,19 @@ namespace BlackMisc
             CKeyboardKey(BlackMisc::Input::KeyCode keyCode);
 
             //! Get key code
-            KeyCode getKey() const { return this->m_keyCode; }
+            KeyCode getKey() const { return m_keyCode; }
 
             //! Get key code
             QString getKeyAsString() const;
 
             //! Set key code
-            void setKey(KeyCode key) { this->m_keyCode = key; }
+            void setKey(KeyCode key) { m_keyCode = key; }
 
             //! Set key code
-            void setKey(int key) { this->m_keyCode = static_cast<KeyCode>(key); }
+            void setKey(int key) { m_keyCode = static_cast<KeyCode>(key); }
 
             //! Set key code
-            void setKey(char key) { this->m_keyCode = static_cast<KeyCode>(key); }
+            void setKey(char key) { m_keyCode = static_cast<KeyCode>(key); }
 
             //! Is unknown?
             bool isUnknown() const { return !this->hasKey(); }
@@ -72,7 +72,7 @@ namespace BlackMisc
             //! with key?
             bool hasKey() const
             {
-                return !(this->m_keyCode == KeyCode::Key_Unknown);
+                return !(m_keyCode == KeyCode::Key_Unknown);
             }
 
             //! Set key object
@@ -97,8 +97,8 @@ namespace BlackMisc
                 BLACK_METAMEMBER(keyCode)
             );
         };
-    }
-}
+    } // ns
+} // ns
 
 Q_DECLARE_METATYPE(BlackMisc::Input::CKeyboardKey)