5 files changed, 11 insertions, 9 deletions
diff --git a/src/crepe/api/Scene.cpp b/src/crepe/api/Scene.cpp
index 092dc62..933edf4 100644
--- a/src/crepe/api/Scene.cpp
+++ b/src/crepe/api/Scene.cpp
@@ -2,4 +2,4 @@
 
 using namespace crepe;
 
-Scene::Scene(std::string name) : name(name) {}
+Scene::Scene(const std::string & name) : name(name) {}
diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h
index 8bb487a..f8bcc3d 100644
--- a/src/crepe/api/Scene.h
+++ b/src/crepe/api/Scene.h
@@ -6,7 +6,7 @@ namespace crepe {
 
 class Scene {
 public:
-	Scene(std::string name);
+	Scene(const std::string & name);
 	virtual ~Scene() = default;
 	virtual void load_scene() = 0;
 
diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
index c8061c9..6fc8f9b 100644
--- a/src/crepe/api/SceneManager.cpp
+++ b/src/crepe/api/SceneManager.cpp
@@ -3,6 +3,7 @@
 #include "SceneManager.h"
 
 using namespace crepe;
+using namespace std;
 
 SceneManager::SceneManager() {}
 
@@ -12,7 +13,7 @@ SceneManager & SceneManager::get_instance() {
 }
 
 // Push the next scene onto the queue
-void SceneManager::load_scene(std::string name) { next_scene.push(name); }
+void SceneManager::load_scene(const std::string & name) { next_scene.push(name); }
 
 // Load a new scene from the queue (if there is one)
 void SceneManager::empty_queue() {
diff --git a/src/crepe/api/SceneManager.h b/src/crepe/api/SceneManager.h
index 87db8d7..b7d5150 100644
--- a/src/crepe/api/SceneManager.h
+++ b/src/crepe/api/SceneManager.h
@@ -19,8 +19,8 @@ public:
 
 public:
 	template <typename T>
-	void add_scene(std::string name);
-	void load_scene(std::string name);
+	void add_scene(const std::string & name);
+	void load_scene(const std::string & name);
 	void empty_queue();
 
 private:
diff --git a/src/crepe/api/SceneManager.hpp b/src/crepe/api/SceneManager.hpp
index 7789823..82787ed 100644
--- a/src/crepe/api/SceneManager.hpp
+++ b/src/crepe/api/SceneManager.hpp
@@ -1,11 +1,12 @@
 #include "SceneManager.h"
 
-using namespace crepe;
-using namespace std;
+namespace crepe {
 
 // Add a new concrete scene to the scene manager
 template <typename T>
-void SceneManager::add_scene(string name) {
-	static_assert(is_base_of<Scene, T>::value, "T must be derived from Scene");
+void SceneManager::add_scene(const std::string & name) {
+	static_assert(std::is_base_of<Scene, T>::value, "T must be derived from Scene");
 	scenes.emplace_back(make_unique<T>(name));
 }
+
+} // namespace crepe