Tab + Cleanup

Signed-off-by: Alexander Kluth <kluth@freshcells.de>