Refactoring service callbacks.