MNT: Made appropriate methods private
Merge remote-tracking branch 'dill/refac_xs' into refac_xs