instrumentation

a little clean-up