Cleaning up displayed messages getting ready for production