critical code review changes