Indicator code cleanup, people in villages