comments and removed cruft.