[Code] Major work on testscore for formatting.  Minor code cleanup.