address review comments. fixup