additional tweak on the broadcasting check + consolidate Index and ndarray