The refactored livestock