Got rid of volume.data object.
Closes #231
Merge pull request #232 from tsherif/volume-cleanup

Got rid of volume.data object.
A little more volume object cleanup.
Merge pull request #233 from tsherif/volume-cleanup

A little more volume object cleanup.