Improve the formatting a bit