small code cleanup and comment changes.
Changes to droplet motion calibration code.