A few small changes

* Make a few methods private
* Simplify a constructor
* Remove some nil checks and caching that are no longer necessary

This is the last in the queue of these little changes.  Thanks for staying on top of them.