Added a printf to show for messages received. And did a bit of cleanup.