Updates for readability and typos