Refactored request() (was previously 'too complex') - second attempt
Refactored request() (was previously 'too complex') - second attempt

PalNilsson/pilot2,mlassnig/pilot2,mlassnig/pilot2,PalNilsson/pilot2