makeRequest.py: if-else cleanup