Chore/privatize internal methods

- Privatize internal methods so public methods are more accessible
- DRY up and clean up debug checking