diff --git a/src/context.rs b/src/context.rs
index c61444c..3839f2f 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -61,7 +61,7 @@ impl Config {
 
 
 #[derive(Debug)]
-#[derive(Clone)]
+//#[derive(Clone)]
 pub struct Context {
 	pub config: Config,
 
@@ -76,12 +76,12 @@ pub struct Context {
 // General functions
 impl Context {
 	pub fn new() -> Context {
-		Context{
+		Context {
 			config: Config::new(),
 			history: Vec::new(),
 			variables: HashMap::new(),
 			functions: HashMap::new(),
-			shadow: HashMap::new(),
+			shadow: HashMap::new()
 		}
 	}
 
diff --git a/src/evaluate/operator.rs b/src/evaluate/operator.rs
index f5fbf8a..0851212 100644
--- a/src/evaluate/operator.rs
+++ b/src/evaluate/operator.rs
@@ -164,7 +164,8 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 
 			if let Expression::Quantity(la, a) = a {
 				if let Expression::Quantity(lb, b) = b {
-					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, a.clone() * b.clone())));
+					let o = a.clone() * b.clone();
+					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, o)));
 				}
 			}
 
diff --git a/src/quantity/unit/unit.rs b/src/quantity/unit/unit.rs
index c49e0b3..68f7beb 100644
--- a/src/quantity/unit/unit.rs
+++ b/src/quantity/unit/unit.rs
@@ -275,7 +275,6 @@ impl Unit {
 		let mut q = Quantity::new_rational(1f64).unwrap();
 		q.set_unit(b);
 		return Some(q);
-
 	}
 }