code review fixup