Cleaned up goats index