Refactoring some pieces in TicTacToeActivity and GameStateSingleton