Move interal methods to private