Cleaning up aggregateModel/adding data format support for bigram/logBigram