diff --git a/remix-lib/src/execution/logsManager.js b/remix-lib/src/execution/logsManager.js
index e5036f2f03..62c296881c 100644
--- a/remix-lib/src/execution/logsManager.js
+++ b/remix-lib/src/execution/logsManager.js
@@ -107,7 +107,7 @@ class LogsManager {
   }
 
   newFilter (filterType, params) {
-    let filterId = '0x' + crypto.randomBytes(16).toString('hex')
+    const filterId = '0x' + crypto.randomBytes(16).toString('hex')
     if (filterType === 'block' || filterType === 'pendingTransactions') {
       this.filters[filterId] = { filterType }
     }
@@ -135,7 +135,6 @@ class LogsManager {
       return blocks.map(block => ('0x' + block.hash().toString('hex')))
     }
     if (filterType === 'pendingTransactions') {
-      // TODO: pending transaction hashes
       return []
     }
   }
diff --git a/remix-simulator/src/methods/accounts.js b/remix-simulator/src/methods/accounts.js
index c3bdddd8a9..d1cd7d1c15 100644
--- a/remix-simulator/src/methods/accounts.js
+++ b/remix-simulator/src/methods/accounts.js
@@ -61,16 +61,16 @@ Accounts.prototype.eth_getBalance = function (payload, cb) {
 }
 
 Accounts.prototype.eth_sign = function (payload, cb) {
-  let address = payload.params[0]
-  let message = payload.params[1]
+  const address = payload.params[0]
+  const message = payload.params[1]
 
-  let privateKey = this.accountsKeys[ethJSUtil.toChecksumAddress(address)]
+  const privateKey = this.accountsKeys[ethJSUtil.toChecksumAddress(address)]
   if (!privateKey) {
     return cb(new Error('unknown account'))
   }
-  let account = this.web3.eth.accounts.privateKeyToAccount(privateKey)
+  const account = this.web3.eth.accounts.privateKeyToAccount(privateKey)
 
-  let data = account.sign(message)
+  const data = account.sign(message)
 
   cb(null, data.signature)
 }
diff --git a/remix-simulator/src/methods/blocks.js b/remix-simulator/src/methods/blocks.js
index d43834172c..cc2b15f28a 100644
--- a/remix-simulator/src/methods/blocks.js
+++ b/remix-simulator/src/methods/blocks.js
@@ -28,7 +28,7 @@ Blocks.prototype.eth_getBlockByNumber = function (payload, cb) {
     blockIndex = executionContext.latestBlockNumber
   }
 
-  var block = executionContext.blocks[blockIndex]
+  const block = executionContext.blocks[blockIndex]
 
   if (!block) {
     return cb(new Error('block not found'))