Removed cruft; improved formatting.