Improved and unified formatting