diff --git a/lib/config/presets.js b/lib/config/presets.js
index 7f6062cdf021df29de64171cc86176e8fbe13edc..d5ca02ab2a4443ce9914d606302681ba4c0470ca 100644
--- a/lib/config/presets.js
+++ b/lib/config/presets.js
@@ -104,7 +104,8 @@ function replaceArgs(obj, argMapping) {
       returnArray.push(replaceArgs(item, argMapping));
     }
     return returnArray;
-  } else if (is.object(obj)) {
+  }
+  if (is.object(obj)) {
     const returnObj = {};
     for (const [key, val] of Object.entries(obj)) {
       returnObj[key] = replaceArgs(val, argMapping);
diff --git a/lib/platform/github/gh-got-wrapper.js b/lib/platform/github/gh-got-wrapper.js
index ca8c82de8662929acbc1117c17316de2a4884817..2d29de453b033a58b18ec739471b0fda964ed647 100644
--- a/lib/platform/github/gh-got-wrapper.js
+++ b/lib/platform/github/gh-got-wrapper.js
@@ -79,7 +79,8 @@ async function get(path, options, retries = 5) {
       await delay(5000 / retries);
 
       return get(path, opts, retries - 1);
-    } else if (
+    }
+    if (
       retries > 0 &&
       err.statusCode === 403 &&
       err.message &&
@@ -98,7 +99,8 @@ async function get(path, options, retries = 5) {
       await delay(180000 / (retries * retries));
 
       return get(path, opts, retries - 1);
-    } else if (
+    }
+    if (
       err.statusCode === 403 &&
       err.message &&
       err.message.includes('rate limit exceeded')
diff --git a/lib/platform/vsts/vsts-helper.js b/lib/platform/vsts/vsts-helper.js
index 5d83064593bee8354f772d52c6c4ee56da2df263..8a05f82803da439a4e834c55e2bc130b835079d2 100644
--- a/lib/platform/vsts/vsts-helper.js
+++ b/lib/platform/vsts/vsts-helper.js
@@ -170,7 +170,8 @@ async function getFile(repoId, repository, filePath, branchName) {
       if (jTmp.typeKey === 'GitItemNotFoundException') {
         // file not found
         return null;
-      } else if (jTmp.typeKey === 'GitUnresolvableToCommitException') {
+      }
+      if (jTmp.typeKey === 'GitUnresolvableToCommitException') {
         // branch not found
         return null;
       }
@@ -266,7 +267,8 @@ function getProjectAndRepo(str) {
       project: str,
       repo: str,
     };
-  } else if (strSplited.length === 2) {
+  }
+  if (strSplited.length === 2) {
     return {
       project: strSplited[0],
       repo: strSplited[1],
diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js
index 1649d298398869c67fd456595b484ca3ed7e7054..d1a6cff02d94878d9b0a9b0c4145527b57274ca4 100644
--- a/lib/workers/branch/index.js
+++ b/lib/workers/branch/index.js
@@ -182,7 +182,8 @@ async function processBranch(branchConfig, packageFiles) {
       if (mergeStatus === 'automerged') {
         logger.debug('Branch is automerged - returning');
         return 'automerged';
-      } else if (
+      }
+      if (
         mergeStatus === 'automerge aborted - PR exists' ||
         mergeStatus === 'branch status error' ||
         mergeStatus === 'failed'
diff --git a/lib/workers/pr/changelog/source-cache.js b/lib/workers/pr/changelog/source-cache.js
index 39a59a8a6244902a21e7f134744ad48690ed9df2..3c6502dc72faca38ea5471388ef240a1352a2206 100644
--- a/lib/workers/pr/changelog/source-cache.js
+++ b/lib/workers/pr/changelog/source-cache.js
@@ -24,15 +24,13 @@ async function getChangeLogJSON(args) {
     const cacheVal = await cacache.get(...cache);
     logger.trace(`Returning cached version of ${depName}`);
     const cachedResult = JSON.parse(cacheVal.data.toString());
-    // istanbul ignore else
-    if (
-      cachedResult &&
-      DateTime.local() < DateTime.fromISO(cachedResult.expiry)
-    ) {
-      logger.debug('Cache hit');
-      delete cachedResult.expiry;
-      return cachedResult;
-    } else if (cachedResult) {
+    if (cachedResult) {
+      if (DateTime.local() < DateTime.fromISO(cachedResult.expiry)) {
+        logger.debug('Cache hit');
+        delete cachedResult.expiry;
+        return cachedResult;
+      }
+      // istanbul ignore next
       logger.debug('Cache expiry');
     }
   } catch (err) {
diff --git a/lib/workers/repository/error.js b/lib/workers/repository/error.js
index ff6c8a963efae0d80da0f0f8cb28f1ed1d7ad90a..c986346427e1b910e0334f4c6328bd9a832a7d22 100644
--- a/lib/workers/repository/error.js
+++ b/lib/workers/repository/error.js
@@ -13,53 +13,66 @@ async function handleError(config, err) {
     logger.info('Repository is uninitiated - skipping');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'disabled') {
+  }
+  if (err.message === 'disabled') {
     logger.info('Repository is disabled - skipping');
     return err.message;
-  } else if (err.message === 'archived') {
+  }
+  if (err.message === 'archived') {
     logger.info('Repository is archived - skipping');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'renamed') {
+  }
+  if (err.message === 'renamed') {
     logger.info('Repository has been renamed - skipping');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'blocked') {
+  }
+  if (err.message === 'blocked') {
     delete config.branchList; // eslint-disable-line no-param-reassign
     logger.info('Repository is blocked - skipping');
     return err.message;
-  } else if (err.message === 'forbidden') {
+  }
+  if (err.message === 'forbidden') {
     delete config.branchList; // eslint-disable-line no-param-reassign
     logger.info('Repository is forbidden');
     return err.message;
-  } else if (err.message === 'not-found') {
+  }
+  if (err.message === 'not-found') {
     delete config.branchList; // eslint-disable-line no-param-reassign
     logger.error('Repository is not found');
     return err.message;
-  } else if (err.message === 'fork') {
+  }
+  if (err.message === 'fork') {
     logger.info('Repository is a fork and not manually configured - skipping');
     return err.message;
-  } else if (err.message === 'no-package-files') {
+  }
+  if (err.message === 'no-package-files') {
     logger.info('Repository has no package files - skipping');
     return err.message;
-  } else if (err.message === 'repository-changed') {
+  }
+  if (err.message === 'repository-changed') {
     logger.info('Repository has changed during renovation - aborting');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'config-validation') {
+  }
+  if (err.message === 'config-validation') {
     delete config.branchList; // eslint-disable-line no-param-reassign
     logger.info({ error: err }, 'Repository has invalid config');
     await raiseConfigWarningIssue(config, err);
     return err.message;
-  } else if (err.message === 'registry-failure') {
+  }
+  if (err.message === 'registry-failure') {
     logger.info('Registry error - skipping');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'rate-limit-exceeded') {
+  }
+  if (err.message === 'rate-limit-exceeded') {
     logger.warn('Rate limit exceeded - aborting');
     delete config.branchList; // eslint-disable-line no-param-reassign
     return err.message;
-  } else if (err.message === 'lockfile-error') {
+  }
+  if (err.message === 'lockfile-error') {
     delete config.branchList; // eslint-disable-line no-param-reassign
     await raiseLockFileIssue(err);
     return err.message;