some minor improvements as proposed by cppcheck
Authored by: heiko 2012-12-28
Parent: [r207]
Child: [r209]