reformat
some corrections for deterministic variants