clean up comments, and compose message