A bit refactoring/cleanup of the SparqlService classes