Merge is finished, can bring the code in readable style again.
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>