Streamlined SOAPDataCollector code for a better readability.