diff --git a/app/controllers/management/highlights_controller.rb b/app/controllers/management/highlights_controller.rb
index 0bdd8ecf2fada45d6f68863ac8a8de5c6941dcd0..a06967692860dfc8e7cee1df3b7da681d4484ce6 100644
--- a/app/controllers/management/highlights_controller.rb
+++ b/app/controllers/management/highlights_controller.rb
@@ -16,17 +16,14 @@ class Management::HighlightsController < ManagementController
   end
 
   def create
+    highlight_repository.insert_data(params[:name],params[:url])
     render :action => 'new'
-    db = OrientDb::HighlightRepository.new
-    db.insert_data(params[:name],params[:url])
-
   end
 
   def destroy
 
     params[:name].each do |name|
-      db = OrientDb::HighlightRepository.new
-      db.destroy_data(name)
+      highlight_repository.destroy_data(name)
     end
     redirect_to management_highlights_index_path
 
diff --git a/app/repositories/orient_db/highlight_repository.rb b/app/repositories/orient_db/highlight_repository.rb
index 279b98b8ce1bccc4b7f5027073f01b99ebc4e03b..7477083cef5236c51c252d7e7fb7127d451da604 100644
--- a/app/repositories/orient_db/highlight_repository.rb
+++ b/app/repositories/orient_db/highlight_repository.rb
@@ -1,27 +1,16 @@
 module OrientDb
   class HighlightRepository < Base
 
-    def register(attributes={})
-
-    end
-
     def find_all
-      return connection.query "SELECT FROM Highlight"
-    rescue
-      return nil
+      connection.query "SELECT FROM Highlight"
     end
 
-
     def insert_data (name,url)
-        return @connection.command "INSERT INTO Highlight (name,URL) VALUES ('#{name}','#{url}')"
-      rescue
-        return nil
+       connection.command "INSERT INTO Highlight (name,URL) VALUES ('#{name}','#{url}')"
     end
 
     def destroy_data(name)
-        return @connection.command "DELETE VERTEX Highlight where name = '#{name}'"
-      rescue
-        return nil
+      connection.command "DELETE VERTEX Highlight where name = '#{name}'"
     end
 
   end
diff --git a/config/initializers/repositories.rb b/config/initializers/repositories.rb
index daa9705118a97141d06576f6c6c35a799f822131..47bcd07cf5791529dfd46ab2184186ad0b4b67c5 100644
--- a/config/initializers/repositories.rb
+++ b/config/initializers/repositories.rb
@@ -1,22 +1,20 @@
-orientdb_instance = OrientDb::Client.instance
-
 Repository::Environments.create :development do |repository|
-  repository.register :user, OrientDb::UserRepository.new(orientdb_instance)
-  repository.register :university, OrientDb::UniversityRepository.new(orientdb_instance)
-  repository.register :highlight, OrientDb::HighlightRepository.new(orientdb_instance)
-  repository.register :country, OrientDb::CountryRepository.new(orientdb_instance)
+  repository.register :user, OrientDb::UserRepository.new(OrientDb::Client.instance)
+  repository.register :university, OrientDb::UniversityRepository.new(OrientDb::Client.instance)
+  repository.register :highlight, OrientDb::HighlightRepository.new(OrientDb::Client.instance)
+  repository.register :country, OrientDb::CountryRepository.new(OrientDb::Client.instance)
 end
 
 Repository::Environments.create :test do |repository|
-  repository.register :user, OrientDb::UserRepository.new(orientdb_instance)
-  repository.register :university, OrientDb::UniversityRepository.new(orientdb_instance)
-  repository.register :highlight, OrientDb::HighlightRepository.new(orientdb_instance)
-  repository.register :country, OrientDb::CountryRepository.new(orientdb_instance)
+  repository.register :user, OrientDb::UserRepository.new(OrientDb::Client.instance)
+  repository.register :university, OrientDb::UniversityRepository.new(OrientDb::Client.instance)
+  repository.register :highlight, OrientDb::HighlightRepository.new(OrientDb::Client.instance)
+  repository.register :country, OrientDb::CountryRepository.new(OrientDb::Client.instance)
 end
 
 Repository::Environments.create :production do |repository|
-  repository.register :user, OrientDb::UserRepository.new(orientdb_instance)
-  repository.register :university, OrientDb::UniversityRepository.new(orientdb_instance)
-  repository.register :highlight, OrientDb::HighlightRepository.new(orientdb_instance)
-  repository.register :country, OrientDb::CountryRepository.new(orientdb_instance)
-end
\ No newline at end of file
+  repository.register :user, OrientDb::UserRepository.new(OrientDb::Client.instance)
+  repository.register :university, OrientDb::UniversityRepository.new(OrientDb::Client.instance)
+  repository.register :highlight, OrientDb::HighlightRepository.new(OrientDb::Client.instance)
+  repository.register :country, OrientDb::CountryRepository.new(OrientDb::Client.instance)
+end