Change some methods to private