Solr code refactoring....