Event "Starting on . . . " format

It is only a small thing however it is just something I realised and though I would mention.
When you create an event and the event starts to countdown it will say “Starting on….” and then the date, time, etc etc. However when it gets to the day of the event it will say “Starting on Today…”and then the time/countdown. 

I just thought maybe instead of this happening, when the event changes to include the word “Today” it removes the word “on” so that it makes sense.