Code cleanup
Add run-time configurable telemetry