Renaming and comment
Actually cleanup Team Scoreboards