fixed the code review comments