Adjusted the formatting to be a bit more sane.