Update calc

Updated constructors, local variables, and the call to checkThreat()