Cleanups for torque preparation scripts to handle more categories of inputs without error