Minor changes.  No logic changed.