Code cleanup

 - simplify ResourceRequest
 - rename RequestContext methods to conform