Tidied up Game class