Made sorting and formatting two distinct events.