Clean up and wording