Refactoring, optimized to avoid OOM
Merge branch 'master' of https://github.com/jacekkrasiukianis/reviewparser