More refactoring + re-wrote Solr full reindex in java, it now takes around 6 minutes to reindex ~60000 products