Refactoring! Also adding persona names to Friends