Cap the message output - some cleanup