Refactor to split Player and UI-related Player information