Nicola: basic reformatting