fix review comments from @galfert