fixing code review comments