Small refactor to StatsClient