Clean up the api

  - add '_' prefix to private methods