Use URLUtils where possible
Fix formatting and remove API keys