renamed getNumEntries() to getNumData()

also renamed some private class variables