Code clean up - updated from Polls to Person objects