Cosmetic changes

Mostly cosmetic changes. Line things up, make sure Volume calibration
and pressure calibration exit function  the same.