Clean-up of loading data in/returning cube objects.
Added class properties.
Removed duplicated return functions.