Model code review comments addded