Edits, rearrangements, and other cleanup to Resume.