Style fix
Refactored external service requests