Refactor Player creation