fixed the code review comments problem