Some redesign, reformatting, and revision