second part of code review