Fix revive identified linter issues: var-declaration, indent-error-flow, increment-decrement, superfluous-else#7528