A bit of reformatting