code beautification and variable-name-fix

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>