Fix typo, misc cleanup.