modifies the way instrumentation is implemented

For style of implementation and to set a pattern for new implementations.