Clean up spec for tidy_messages

[jonthegeek]

I started to go down a rabbit hole of cleaning up tidy_messages, but that's not needed for this version. But do it eventually!