Merge pull request #1830 from tbo47/var-to-const-or-let

Merge pull request #1830 from tbo47/var-to-const-or-let #371