Tidying up X-datastream content grabbing