Improve formatting a bit