More cleanup. Improve printout.