Cleanup

Fixed a bug that made player tracking work incorrectly. Took awhile to
track down. The code is a bit cleaner, with a few double references
removed.