Minor edits
Minor re-org at the end