Tiding up the formatting