Fix for new people.json format, formatting/cleanup