Refactoring HumanFarm