a bit of reformatting to fit 80-char lines