Refactoring callouts