address pr code review comments