v1.13 4

Code cleanup
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>