apply review comments from @galfert