Tidy up text a little before wordwrap
Comment out unneeded tracing statements