Refactor Raster data load and nodata behaviour - Issue #297

This addresses the refactoring issues addressed in Issue #297