Removed some cut-pasted cruft.
Some formatting changes.