Some edits for clarity and consistancy