Refactor people