fixup! address comments from first review