Reformatted some lines commented by Matei