Refactor some out-of-band request code