Clean up, added persons
Change to link class reference