diff --git a/src/common/QskHctColor.h b/src/common/QskHctColor.h
index 041c0e4e..7dafc247 100644
--- a/src/common/QskHctColor.h
+++ b/src/common/QskHctColor.h
@@ -12,7 +12,7 @@
 /*
     For M(aterial)3 the new HTC color system has been created, that
     is based on H(ue), (C)hroma, (T)one:
- 
+
         https://material.io/blog/science-of-color-design
 
     This system allows to create color palettes by varying the tone
@@ -80,8 +80,10 @@ inline constexpr QskHctColor QskHctColor::toned( qreal tone ) const noexcept
 }
 
 #ifndef QT_NO_DEBUG_STREAM
+
     class QDebug;
     QSK_EXPORT QDebug operator<<( QDebug, const QskHctColor& );
+
 #endif
 
 #endif
diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp
index 98e992e4..e6801fbd 100644
--- a/src/common/QskTextOptions.cpp
+++ b/src/common/QskTextOptions.cpp
@@ -7,10 +7,10 @@
 #include <qtextdocument.h>
 
 static void qskRegisterTextOptions()
-{   
+{
     qRegisterMetaType< QskTextOptions >();
-}       
-    
+}
+
 Q_CONSTRUCTOR_FUNCTION( qskRegisterTextOptions )
 
 int QskTextOptions::textFlags() const noexcept
diff --git a/src/controls/QskCheckBoxSkinlet.cpp b/src/controls/QskCheckBoxSkinlet.cpp
index 44ad66a5..62d55e0e 100644
--- a/src/controls/QskCheckBoxSkinlet.cpp
+++ b/src/controls/QskCheckBoxSkinlet.cpp
@@ -125,7 +125,7 @@ QSGNode* QskCheckBoxSkinlet::updateIndicatorNode(
 
 #if 1
     /*
-        Our default skins do not have the concept of colorRoles 
+        Our default skins do not have the concept of colorRoles
         implemented. Until then we do the recoloring manually here
      */
     QskColorFilter filter;
diff --git a/src/controls/QskCheckBoxSkinlet.h b/src/controls/QskCheckBoxSkinlet.h
index 770d572b..aaca18e7 100644
--- a/src/controls/QskCheckBoxSkinlet.h
+++ b/src/controls/QskCheckBoxSkinlet.h
@@ -43,7 +43,7 @@ class QSK_EXPORT QskCheckBoxSkinlet : public QskSkinlet
   private:
     QRectF textRect( const QskCheckBox*, const QRectF& ) const;
     QRectF boxRect( const QskCheckBox*, const QRectF& ) const;
-    
+
     QSGNode* updateIndicatorNode( const QskCheckBox*, QSGNode* ) const;
     QSGNode* updateTextNode( const QskCheckBox*, QSGNode* ) const;
 };
diff --git a/src/controls/QskControlPrivate.cpp b/src/controls/QskControlPrivate.cpp
index 96f9caf0..bcdd6f1e 100644
--- a/src/controls/QskControlPrivate.cpp
+++ b/src/controls/QskControlPrivate.cpp
@@ -422,7 +422,7 @@ void QskControlPrivate::setPlacementPolicy(
         else
         {
             this->visiblePlacementPolicy =
-                 ( policy == QskPlacementPolicy::Reserve ) ? 1 : 0;
+                ( policy == QskPlacementPolicy::Reserve ) ? 1 : 0;
 
             if ( isTransparentForPositioner() )
             {
diff --git a/src/controls/QskPushButtonSkinlet.cpp b/src/controls/QskPushButtonSkinlet.cpp
index a7fcf71b..657b09fc 100644
--- a/src/controls/QskPushButtonSkinlet.cpp
+++ b/src/controls/QskPushButtonSkinlet.cpp
@@ -59,7 +59,7 @@ QRectF QskPushButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
     if ( ( subControl == Q::Text ) || ( subControl == Q::Graphic ) )
     {
         const auto r = button->subControlContentsRect( contentsRect, Q::Panel );
-            
+
         LayoutEngine layoutEngine( button );
         layoutEngine.setGeometries( r );
 
diff --git a/src/controls/QskSliderSkinlet.cpp b/src/controls/QskSliderSkinlet.cpp
index 6d25379c..ede1f99a 100644
--- a/src/controls/QskSliderSkinlet.cpp
+++ b/src/controls/QskSliderSkinlet.cpp
@@ -236,12 +236,15 @@ QRectF QskSliderSkinlet::handleRect(
 QRectF QskSliderSkinlet::rippleRect(
     const QskSlider* slider, const QRectF& rect ) const
 {
+    const auto rippleSize = slider->strutSizeHint( QskSlider::Ripple );
+    const auto handleSize = slider->strutSizeHint( QskSlider::Handle );
+
+    const auto w = ( rippleSize.width() - handleSize.width() ) / 2;
+    const auto h = ( rippleSize.height() - handleSize.height() ) / 2;
+
     auto r = handleRect( slider, rect );
-    auto rippleSize = slider->strutSizeHint( QskSlider::Ripple );
-    auto handleSize = slider->strutSizeHint( QskSlider::Handle );
-    auto w = ( rippleSize.width() - handleSize.width() ) / 2,
-            h = ( rippleSize.height() - handleSize.height() ) / 2;
     r = r.marginsAdded( { w, h, w, h } );
+
     return r;
 }
 
diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp
index c469441d..b068e4f8 100644
--- a/src/controls/QskTabBar.cpp
+++ b/src/controls/QskTabBar.cpp
@@ -309,7 +309,7 @@ void QskTabBar::setEdge( Qt::Edge edge )
 {
     const auto oldEdge = this->edge();
 
-    setFlagHint( Panel | QskAspect::Style, edge ); 
+    setFlagHint( Panel | QskAspect::Style, edge );
 
     if ( edge == oldEdge )
         return;
diff --git a/src/controls/QskTabButton.cpp b/src/controls/QskTabButton.cpp
index 0ffb7b8f..20b4167c 100644
--- a/src/controls/QskTabButton.cpp
+++ b/src/controls/QskTabButton.cpp
@@ -88,7 +88,7 @@ QskTextOptions QskTabButton::textOptions() const
 }
 
 void QskTabButton::resetTextOptions()
-{   
+{
     if ( resetTextOptionsHint( Text ) )
         Q_EMIT textOptionsChanged();
 }
diff --git a/src/controls/QskTextLabel.cpp b/src/controls/QskTextLabel.cpp
index b7d24237..dd8a897c 100644
--- a/src/controls/QskTextLabel.cpp
+++ b/src/controls/QskTextLabel.cpp
@@ -104,7 +104,7 @@ QskTextOptions QskTextLabel::textOptions() const
 }
 
 void QskTextLabel::resetTextOptions()
-{   
+{
     if ( resetTextOptionsHint( Text ) )
         Q_EMIT textOptionsChanged( textOptions() );
 }
diff --git a/src/layouts/QskStackBoxAnimator.cpp b/src/layouts/QskStackBoxAnimator.cpp
index 80d75473..ba1fa84c 100644
--- a/src/layouts/QskStackBoxAnimator.cpp
+++ b/src/layouts/QskStackBoxAnimator.cpp
@@ -68,7 +68,7 @@ namespace
 
       public:
         RotationTransform( Qt::Axis axis, qreal dx1, qreal dy1, qreal dx2,
-                           qreal dy2, qreal radians, QQuickItem* item )
+                qreal dy2, qreal radians, QQuickItem* item )
             : QQuickTransform( item )
             , m_axis( axis )
             , m_dx1( dx1 )
diff --git a/src/layouts/QskSubcontrolLayoutEngine.cpp b/src/layouts/QskSubcontrolLayoutEngine.cpp
index 5c7f1b55..36f65b87 100644
--- a/src/layouts/QskSubcontrolLayoutEngine.cpp
+++ b/src/layouts/QskSubcontrolLayoutEngine.cpp
@@ -336,7 +336,7 @@ void QskSubcontrolLayoutEngine::setGraphicTextElements( const QskSkinnable* skin
     GraphicElement* graphicElement = nullptr;
     if ( !graphicSize.isEmpty() && ( graphicSubControl != QskAspect::Control ) )
     {
-        graphicElement = dynamic_cast< GraphicElement * >( element( graphicSubControl ) );
+        graphicElement = dynamic_cast< GraphicElement* >( element( graphicSubControl ) );
         if ( graphicElement == nullptr )
         {
             graphicElement = new GraphicElement( skinnable, graphicSubControl );
@@ -445,7 +445,7 @@ QskSizePolicy QskSubcontrolLayoutEngine::sizePolicyAt( int index ) const
 
 int QskSubcontrolLayoutEngine::count() const
 {
-    return m_data->elements.count(); 
+    return m_data->elements.count();
 }
 
 void QskSubcontrolLayoutEngine::layoutItems()