much more readable code

Change-Id: I217492e2e6e7d4048ff993a7c7eba23cfcfedef4
Signed-off-by: Matthias Fritzsche <txt.file@txtfile.eu>