Editing per Scot's comments