Reformat Ingmar’s edits a little