Edits suggested by EA review