diff --git lib/hawkular/inventory/inventory_api.rb lib/hawkular/inventory/inventory_api.rb
index bb7bc16..a054a8a 100644
--- lib/hawkular/inventory/inventory_api.rb
+++ lib/hawkular/inventory/inventory_api.rb
@@ -445,12 +445,13 @@ module Hawkular::Inventory
     end

     def extract_structures_from_body(response_body_array)
-      response_body_array.map { |element| Client.rebuild_from_chunks(element['data']) }
+      response_body_array.map { |element| rebuild_from_chunks(element['data']) }
         .select { |full| full } # evict nil
-        .map { |full| Client.decompress(full) }
+        .map { |full| decompress(full) }
     end

-    def self.rebuild_from_chunks(data_node)
+private
+    def rebuild_from_chunks(data_node)
       return if data_node.empty?
       master_data = data_node[0]
       return Base64.decode64(master_data['value']) unless (master_data.key? 'tags') &&
@@ -471,12 +472,11 @@ module Hawkular::Inventory
         full.concat(Base64.decode64(slave_data['value']))
       end
     end
-    private_class_method :rebuild_from_chunks

-    def self.decompress(raw)
+    def decompress(raw)
       gz = Zlib::GzipReader.new(StringIO.new(raw))
       JSON.parse(gz.read)
     end
-    private_class_method :decompress
+
   end
 end