Reduce scope for a variable
Merge pull request #902 from hansjoachim/reduced-scope

Reduce scope for a variable