Chore/privatize internal methods

- Privatize internal methods so public methods are more accessible
- Clean up some redundant debug checking