Cleaning up team summary code
Some optimization, some cleanup code, some caching.  Performance better, but not great