Cleaned out messages and added utilities.
Shaping up messages again.