Moved values into calc.php and mapped to structure it uses