cleaned up the messages template