Storage retrieval requests: reused more code, fixed minor issues and addressed other review comments.