A bit of formating cleanup