lint: reduce scope

Fix some lint warnings of kind
```
style (variableScope): The scope of the variable '…' can be reduced
```
"ACK", "LGTM", whatever :). I'm okay with the patch.