changes after first code review