Local code review changes 2