Player and ScoreBoard refactored