Formatted ScoreUpdater / ScoreRecording.
Fixed Merge conflicts.