Code cleanup, cloud-related datastreams names fix, wip on som reader