Re-clean of same person related code