Improve formatting a little