refactoring callouts