Finish up some cleanup for getData (closes #14)