Refactoring, adding a Scoreboard class and separating out a Goal class