Refact Code
Fix Benchmark Tests
Remove unnecessary exported method