Some cleanup, some edits.