Cleaned - solr-code in it's own class