code review fixes part 2