Move some methods to private