Removed bold scores because of a color inconsitency in some terminals
Some restructuring