fixup: updates based on review comments.