Improve formatting slightly