address review comments by @squarecog