changes following code review