clean up code following sonar proposals
Authored by: panneck-conradi 2013-11-17
Parent: [r24]
Child: [r26]