Tidy up the harvester code
Tidy up the harvester code