Refactor server.request

Getting rid of some duplication and made a couple of parameter names that tripped me up more explicit.