More team activity changes

Just a bit of code cleanup.  I don't think it should affect the behavior at all.