some cleanup

- Since moving everything to a single storage location, I'm starting to
reduce the extra variables used in various places.  Still not 100%
satisfied with the storage mechanism and may change it again.
- Added some documentation