Refactor and correct data harvesting