code review comments from TomMalbran