Refactoring + Grafana