Made more instructor-suggested edits