Improve formatting of core