A little bit of reformatting