tune inserts and improve cosmetics

Signed-off-by: Torsten Dahms <torsten.dahms@cern.ch>