Make some methods private which should be so