Minor code cleanup and minor optimizations
Adding benchmarks for YapCollectionsDatabase