cleaned up comments , removed manual instrumentation