[DEV] Cleanup of Player class