model spec code review comment fixes