diff --git a/src/modules/welcome/checker/ResultWidget.cpp b/src/modules/welcome/checker/ResultWidget.cpp
index 0a0b438e1..3c3af62d4 100644
--- a/src/modules/welcome/checker/ResultWidget.cpp
+++ b/src/modules/welcome/checker/ResultWidget.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,14 +26,15 @@
 
 static inline void setCondition( QLabel* label, CalamaresUtils::ImageType t )
 {
-    label->setPixmap( CalamaresUtils::defaultPixmap( t,
-                                                    CalamaresUtils::Original,
-                                                    QSize( label->height(), label->height() ) ) );
+    label->setPixmap(
+        CalamaresUtils::defaultPixmap( t,
+                                       CalamaresUtils::Original,
+                                       QSize( label->height(), label->height() ) ) );
 }
 
 ResultWidget::ResultWidget( bool satisfied,
-                                  bool required,
-                                  QWidget* parent )
+                            bool required,
+                            QWidget* parent )
     : QWidget( parent )
 {
     QBoxLayout* mainLayout = new QHBoxLayout;
@@ -48,11 +49,10 @@ ResultWidget::ResultWidget( bool satisfied,
 
     if ( satisfied )
         setCondition( m_iconLabel, CalamaresUtils::StatusOk );
+    else if ( required )
+        setCondition( m_iconLabel, CalamaresUtils::StatusError );
     else
-        if ( required )
-            setCondition( m_iconLabel, CalamaresUtils::StatusError );
-        else
-            setCondition( m_iconLabel, CalamaresUtils::StatusWarning );
+        setCondition( m_iconLabel, CalamaresUtils::StatusWarning );
 }
 
 
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index ca1a9459a..5908e4bf5 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -69,9 +69,7 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
 
             allChecked = false;
             if ( entry.mandatory )
-            {
                 requirementsSatisfied = false;
-            }
             ciw->setAutoFillBackground( true );
             QPalette pal( ciw->palette() );
             pal.setColor( QPalette::Background, Qt::white );
@@ -97,7 +95,7 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
                                         "requirements for installing %1.<br/>"
                                         "Installation cannot continue. "
                                         "<a href=\"#details\">Details...</a>" )
-                                        .arg( *Calamares::Branding::ShortVersionedName ) );
+                                    .arg( *Calamares::Branding::ShortVersionedName ) );
             )
             textLabel->setOpenExternalLinks( false );
             connect( textLabel, &QLabel::linkActivated,
@@ -114,7 +112,7 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
                                         "recommended requirements for installing %1.<br/>"
                                         "Installation can continue, but some features "
                                         "might be disabled." )
-                                        .arg( *Calamares::Branding::ShortVersionedName ) );
+                                    .arg( *Calamares::Branding::ShortVersionedName ) );
             )
         }
     }
@@ -122,16 +120,16 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
     if ( allChecked && requirementsSatisfied )
     {
         if ( !Calamares::Branding::instance()->
-             imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
+                imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
         {
             QPixmap theImage = QPixmap( Calamares::Branding::instance()->
-                               imagePath( Calamares::Branding::ProductWelcome ) );
+                                        imagePath( Calamares::Branding::ProductWelcome ) );
             if ( !theImage.isNull() )
             {
                 QLabel* imageLabel;
                 if ( Calamares::Branding::instance()->welcomeExpandingLogo() )
                 {
-                    FixedAspectRatioLabel *p = new FixedAspectRatioLabel;
+                    FixedAspectRatioLabel* p = new FixedAspectRatioLabel;
                     p->setPixmap( theImage );
                     imageLabel = p;
                 }
@@ -155,9 +153,7 @@ ResultsListWidget::init( const Calamares::RequirementsList& checkEntries )
         )
     }
     else
-    {
         m_mainLayout->addStretch();
-    }
 }
 
 
@@ -194,8 +190,8 @@ ResultsListWidget::showDetailsDialog( const Calamares::RequirementsList& checkEn
     }
 
     QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close,
-                                                        Qt::Horizontal,
-                                                        this );
+            Qt::Horizontal,
+            this );
     mainLayout->addWidget( buttonBox );
 
     detailsDialog->setModal( true );
diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h
index 58bac0602..3be02b0d0 100644
--- a/src/modules/welcome/checker/ResultsListWidget.h
+++ b/src/modules/welcome/checker/ResultsListWidget.h
@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by