Updated output

Changed to display the name and message on submit.
Clean up

Cleaned up and reordered code