refactor(metrics): cleaning up metrics collection
refactor(metrics): cleaning up metrics collection