Fix formatting of some lines after the reformatting previously done with Eclipse