diff --git a/README.md b/README.md
index 8d7f58d0..22194e18 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ Have a look at `environments.toml` for more fined-grained control.
 npm run dev
 ```
 
-Open the server URL in your web browser. 
+Open the server URL in your web browser.
 
 4. For testnet/mainnet deployment:
 
diff --git a/contracts/guess-the-number/src/lib.rs b/contracts/guess-the-number/src/lib.rs
index bdf7d287..4a9ee2cd 100644
--- a/contracts/guess-the-number/src/lib.rs
+++ b/contracts/guess-the-number/src/lib.rs
@@ -4,8 +4,8 @@ use soroban_sdk::{contract, contractimpl, symbol_short, Address, BytesN, Env, Sy
 #[contract]
 pub struct GuessTheNumber;
 
-pub const NUMBER_KEY: &Symbol = &symbol_short!("NUMBER");
-pub const ADMIN_KEY: &Symbol = &symbol_short!("ADMIN");
+const THE_NUMBER: &Symbol = &symbol_short!("n");
+const ADMIN_KEY: &Symbol = &symbol_short!("ADMIN");
 
 #[contractimpl]
 impl GuessTheNumber {
@@ -19,12 +19,12 @@ impl GuessTheNumber {
     pub fn reset(env: &Env) {
         Self::require_admin(env);
         let new_number: u64 = env.prng().gen_range(1..=10);
-        env.storage().instance().set(NUMBER_KEY, &new_number);
+        env.storage().instance().set(THE_NUMBER, &new_number);
     }
 
     /// Guess a number between 1 and 10
     pub fn guess(env: &Env, a_number: u64) -> bool {
-        a_number == Self::number(env)
+        a_number == env.storage().instance().get::<_, u64>(THE_NUMBER).expect("no number set")
     }
 
     /// Upgrade the contract to new wasm. Only callable by admin.
@@ -33,10 +33,6 @@ impl GuessTheNumber {
         env.deployer().update_current_contract_wasm(new_wasm_hash);
     }
 
-    pub(crate) fn number(env: &Env) -> u64 {
-        env.storage().instance().get::<_, u64>(NUMBER_KEY).unwrap()
-    }
-
     /// Get current admin
     pub fn admin(env: &Env) -> Option<Address> {
         env.storage().instance().get(ADMIN_KEY)
@@ -59,5 +55,4 @@ impl GuessTheNumber {
 }
 
 mod error;
-mod test;
-mod xlm;
+mod test;
\ No newline at end of file
diff --git a/src/components/GuessTheNumber.tsx b/src/components/GuessTheNumber.tsx
index d319ea02..8287dc92 100644
--- a/src/components/GuessTheNumber.tsx
+++ b/src/components/GuessTheNumber.tsx
@@ -23,11 +23,7 @@ export const GuessTheNumber = () => {
       a_number: BigInt(theGuess),
       guesser: address,
     });
-    if (result.isErr()) {
-      console.error(result.unwrapErr());
-    } else {
-      setGuessedIt(result.unwrap());
-    }
+    setGuessedIt(result);
   };
 
   return (