Refactor the people a bit