Slight extension of MessageProvider
clean up formula