Improve formatting consistency