More clean up and a bit  more re-wording.