Remove unreachable code, reduce some variable's scope

Christoph Grüningerrequested to merge
feature/first-cppcheck-warnings into master

Fixes four Cppcheck warnings.

Merge request reports