Small cleanup, and reference to original authors of pieces I didn't write myself.