Improved formatting of notifications