Move internal functions out of public scope