- Remove unnecessary calls to GetPlayer
- Invert "if" statements to reduce nesting
- Cleanup code