diff --git a/libs/remix-debug/src/solidity-decoder/astHelper.js b/libs/remix-debug/src/solidity-decoder/astHelper.js
index 3713154d9b..2ac023bcc7 100644
--- a/libs/remix-debug/src/solidity-decoder/astHelper.js
+++ b/libs/remix-debug/src/solidity-decoder/astHelper.js
@@ -51,27 +51,24 @@ function extractStateDefinitions (contractName, sourcesList, contracts) {
     contracts = extractContractDefinitions(sourcesList)
   }
   const node = contracts.contractsByName[contractName]
-  if (node) {
-    const stateItems = []
-    const stateVar = []
-    const baseContracts = getLinearizedBaseContracts(node.id, contracts.contractsById)
-    baseContracts.reverse()
-    for (let k in baseContracts) {
-      const ctr = baseContracts[k]
-      for (let i in ctr.children) {
-        const item = ctr.children[i]
-        stateItems.push(item)
-        if (item.name === 'VariableDeclaration') {
-          stateVar.push(item)
-        }
+  if (!node) {
+    return null
+  }
+  const stateItems = []
+  const stateVar = []
+  const baseContracts = getLinearizedBaseContracts(node.id, contracts.contractsById)
+  baseContracts.reverse()
+  for (let k in baseContracts) {
+    const ctr = baseContracts[k]
+    for (let i in ctr.children) {
+      const item = ctr.children[i]
+      stateItems.push(item)
+      if (item.name === 'VariableDeclaration') {
+        stateVar.push(item)
       }
     }
-    return {
-      stateDefinitions: stateItems,
-      stateVariables: stateVar
-    }
   }
-  return null
+  return {stateDefinitions: stateItems, stateVariables: stateVar}
 }
 
 /**
diff --git a/libs/remix-debug/src/solidity-decoder/types/Bool.js b/libs/remix-debug/src/solidity-decoder/types/Bool.js
index 659ac12d44..da8c47c3fa 100644
--- a/libs/remix-debug/src/solidity-decoder/types/Bool.js
+++ b/libs/remix-debug/src/solidity-decoder/types/Bool.js
@@ -10,10 +10,9 @@ class Bool extends ValueType {
   decodeValue (value) {
     if (!value) {
       return false
-    } else {
-      value = util.extractHexByteSlice(value, this.storageBytes, 0)
-      return value !== '00'
     }
+    value = util.extractHexByteSlice(value, this.storageBytes, 0)
+    return value !== '00'
   }
 }
 
diff --git a/libs/remix-debug/src/solidity-decoder/types/Enum.js b/libs/remix-debug/src/solidity-decoder/types/Enum.js
index 3c384e6084..d6e558bfeb 100644
--- a/libs/remix-debug/src/solidity-decoder/types/Enum.js
+++ b/libs/remix-debug/src/solidity-decoder/types/Enum.js
@@ -16,14 +16,12 @@ class Enum extends ValueType {
   decodeValue (value) {
     if (!value) {
       return this.enumDef.children[0].attributes.name
-    } else {
-      value = parseInt(value, 16)
-      if (this.enumDef.children.length > value) {
-        return this.enumDef.children[value].attributes.name
-      } else {
-        return 'INVALID_ENUM<' + value + '>'
-      }
     }
+    value = parseInt(value, 16)
+    if (this.enumDef.children.length > value) {
+      return this.enumDef.children[value].attributes.name
+    }
+    return 'INVALID_ENUM<' + value + '>'
   }
 }
 
diff --git a/libs/remix-debug/src/solidity-decoder/types/util.js b/libs/remix-debug/src/solidity-decoder/types/util.js
index c338114fb5..719f082dc5 100644
--- a/libs/remix-debug/src/solidity-decoder/types/util.js
+++ b/libs/remix-debug/src/solidity-decoder/types/util.js
@@ -100,9 +100,8 @@ function extractLocation (type) {
   let match = type.match(/( storage ref| storage pointer| memory| calldata)?$/)
   if (match[1] !== '') {
     return match[1].trim()
-  } else {
-    return null
   }
+  return null
 }
 
 function extractLocationFromAstVariable (node) {
@@ -110,9 +109,8 @@ function extractLocationFromAstVariable (node) {
     return node.attributes.storageLocation
   } else if (node.attributes.stateVariable) {
     return 'storage'
-  } else {
-    return 'default' // local variables => storage, function parameters & return values => memory, state => storage
   }
+  return 'default' // local variables => storage, function parameters & return values => memory, state => storage
 }
 
 function normalizeHex (hex) {