Indentation formating, remove unused conditional, removed missed code from calibration strip out