More editing for clarity and completeness