address code review comments on windows side