Minor changes, generalized a few methods.  Trying to make code more
readable.