Some polishing on WatershedWithSheds