cleaned up calculator_spec