fixup: code cleanup according to code review