code review fix + questions