Refactored url strings in client