Refactor person