code review comments fixed