Edits based on code review comments.