Clean up some code

Make code use playerID/teamID more consistently