Finished team match summary
Code cleanup