Switch to private methods for some stuff

Closes gh-234. Thoughts on what can also be made private?