fixup: changes according to code review