Formatting fixes per WouterJ's comments