diff --git a/src/lib/gui/ScreenSetupModel.cpp b/src/lib/gui/ScreenSetupModel.cpp
index 6954a770a..8adc67cd8 100644
--- a/src/lib/gui/ScreenSetupModel.cpp
+++ b/src/lib/gui/ScreenSetupModel.cpp
@@ -124,22 +124,24 @@ bool ScreenSetupModel::dropMimeData(
   stream >> sourceColumn;
   stream >> sourceRow;
 
+  const auto pColumn = parent.column();
+  const auto pRow = parent.row();
+
   // don't drop screen onto itself
-  if (sourceColumn == parent.column() && sourceRow == parent.row())
+  if (sourceColumn == pColumn && sourceRow == pRow)
     return false;
 
   Screen droppedScreen;
   stream >> droppedScreen;
 
-  auto oldScreen = Screen(screen(parent.column(), parent.row()));
-  if (!oldScreen.isNull() && sourceColumn != -1 && sourceRow != -1) {
+  if (auto oldScreen = Screen(screen(pColumn, pRow)); !oldScreen.isNull() && sourceColumn != -1 && sourceRow != -1) {
     // mark the screen so it isn't deleted after the dragndrop succeeded
     // see ScreenSetupView::startDrag()
     oldScreen.setSwapped(true);
     screen(sourceColumn, sourceRow) = oldScreen;
   }
 
-  screen(parent.column(), parent.row()) = droppedScreen;
+  screen(pColumn, pRow) = droppedScreen;
 
   Q_EMIT screensChanged();
 
diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp
index 4c1d998d1..f05529e85 100644
--- a/src/lib/gui/tls/TlsCertificate.cpp
+++ b/src/lib/gui/tls/TlsCertificate.cpp
@@ -32,8 +32,7 @@ bool TlsCertificate::generateCertificate(const QString &path, int keyLength) con
   qDebug("generating tls certificate: %s", qUtf8Printable(path));
 
   QFileInfo info(path);
-  QDir dir(info.absolutePath());
-  if (!dir.exists() && !dir.mkpath(".")) {
+  if (QDir dir(info.absolutePath()); !dir.exists() && !dir.mkpath(".")) {
     qCritical("failed to create directory for tls certificate");
     return false;
   }
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index d21bca71f..19a3d7299 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -546,10 +546,7 @@ void SecureSocket::checkResult(int status, int &retry)
 {
   // ssl errors are a little quirky. the "want" errors are normal and
   // should result in a retry.
-
-  int errorCode = SSL_get_error(m_ssl->m_ssl, status);
-
-  switch (errorCode) {
+  switch (auto errorCode = SSL_get_error(m_ssl->m_ssl, status); errorCode) {
   case SSL_ERROR_NONE:
     retry = 0;
     // operation completed