Some suggestions from Keith. One of the constructors is probably extraneous now, as well.