Some beautification of device identification and calibration