edits: from review comments