Some code cleanup and const string definition
Signed-off-by: Andre Klein <andre.klein@dkfz-heidelberg.de>