Addressed more edits