Small refactor on ceilometer client