Cleaneup and updated Person Entity