Switch to private methods for some stuff