do a lot of formatting

Signed-off-by: Bruno Waßerer <b.wasserer@wasserer.biz>