Refactor player attributes into Player