Refactoring + added people names as features