Make functions I'm not sure should be exposed private