Small refactor.
Remove Person classes.