Finished points, goals, conceded, cleaned up code