- Optimized player preparation
- Cleaned code