cleanup autorecalibrate implementation and make it more... cpp