From e1f8c001dd4d792b059b38f68bd52d1343ae7666 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Tue, 21 Jun 2016 03:59:43 +0200
Subject: [PATCH] refactor: Pass by value

---
 include/bar.hpp                 |  2 +-
 include/drawtypes/animation.hpp |  2 +-
 include/drawtypes/bar.hpp       |  4 ++--
 include/drawtypes/icon.hpp      | 14 +++++++-------
 include/drawtypes/label.hpp     | 10 +++++-----
 include/drawtypes/ramp.hpp      |  2 +-
 include/eventloop.hpp           |  2 +-
 include/interfaces/alsa.hpp     |  8 ++++----
 include/interfaces/mpd.hpp      | 10 +++++-----
 include/interfaces/net.hpp      | 10 +++++-----
 include/lemonbuddy.hpp          |  2 +-
 include/modules/backlight.hpp   |  4 ++--
 include/modules/base.hpp        | 15 +++++++--------
 include/modules/battery.hpp     |  4 ++--
 include/modules/bspwm.hpp       |  6 +++---
 include/modules/counter.hpp     |  4 ++--
 include/modules/cpu.hpp         |  4 ++--
 include/modules/date.hpp        |  6 +++---
 include/modules/i3.hpp          |  6 +++---
 include/modules/memory.hpp      |  4 ++--
 include/modules/menu.hpp        |  6 +++---
 include/modules/mpd.hpp         |  6 +++---
 include/modules/network.hpp     |  4 ++--
 include/modules/script.hpp      |  4 ++--
 include/modules/text.hpp        |  2 +-
 include/modules/volume.hpp      |  7 +++----
 include/registry.hpp            |  6 +++---
 include/services/builder.hpp    | 22 +++++++++++-----------
 include/services/command.hpp    |  4 ++--
 include/services/inotify.hpp    |  4 ++--
 include/services/store.hpp      |  2 +-
 include/utils/cli.hpp           | 20 ++++++++++----------
 include/utils/config.hpp        | 18 +++++++++---------
 include/utils/io.hpp            | 20 ++++++++++----------
 include/utils/proc.hpp          |  2 +-
 include/utils/string.hpp        | 30 +++++++++++++++---------------
 include/utils/xlib.hpp          |  2 +-
 src/drawtypes/animation.cpp     |  2 +-
 src/drawtypes/bar.cpp           |  4 ++--
 src/drawtypes/icon.cpp          | 10 +++++-----
 src/drawtypes/label.cpp         |  6 +++---
 src/drawtypes/ramp.cpp          |  2 +-
 src/eventloop.cpp               |  2 +-
 src/interfaces/alsa.cpp         |  2 +-
 src/interfaces/net.cpp          |  8 ++++----
 src/lemonbuddy.cpp              |  5 +++--
 src/modules/backlight.cpp       |  4 ++--
 src/modules/base.cpp            |  5 +++--
 src/modules/battery.cpp         |  4 ++--
 src/modules/bspwm.cpp           |  6 +++---
 src/modules/counter.cpp         |  4 ++--
 src/modules/cpu.cpp             |  4 ++--
 src/modules/date.cpp            |  6 +++---
 src/modules/i3.cpp              |  6 +++---
 src/modules/memory.cpp          |  6 +++---
 src/modules/menu.cpp            |  6 +++---
 src/modules/mpd.cpp             |  6 +++---
 src/modules/network.cpp         |  4 ++--
 src/modules/script.cpp          |  4 ++--
 src/modules/text.cpp            |  2 +-
 src/modules/volume.cpp          |  6 +++---
 src/registry.cpp                |  6 +++---
 src/services/builder.cpp        | 22 +++++++++++-----------
 src/services/command.cpp        |  4 ++--
 src/services/inotify.cpp        |  2 +-
 src/services/store.cpp          |  2 +-
 src/utils/cli.cpp               | 18 +++++++++---------
 src/utils/config.cpp            |  8 ++++----
 src/utils/io.cpp                | 18 +++++++++---------
 src/utils/proc.cpp              |  2 +-
 src/utils/string.cpp            | 30 +++++++++++++++---------------
 src/utils/xlib.cpp              |  2 +-
 72 files changed, 253 insertions(+), 253 deletions(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index 96f92608..bdd9124a 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -20,7 +20,7 @@ struct Font
   std::string id;
   int offset;
 
-  Font(const std::string& id, int offset)
+  Font(std::string id, int offset)
     : id(id), offset(offset){}
 };
 
diff --git a/include/drawtypes/animation.hpp b/include/drawtypes/animation.hpp
index 1ddffff2..a003fdb2 100644
--- a/include/drawtypes/animation.hpp
+++ b/include/drawtypes/animation.hpp
@@ -34,5 +34,5 @@ namespace drawtypes
       }
   };
 
-  std::unique_ptr<Animation> get_config_animation(const std::string& config_path, const std::string& animation_name = "animation", bool required = true);
+  std::unique_ptr<Animation> get_config_animation(std::string config_path, std::string animation_name = "animation", bool required = true);
 }
diff --git a/include/drawtypes/bar.hpp b/include/drawtypes/bar.hpp
index 1a9379aa..220401f3 100644
--- a/include/drawtypes/bar.hpp
+++ b/include/drawtypes/bar.hpp
@@ -24,7 +24,7 @@ namespace drawtypes
       std::unique_ptr<Icon> indicator;
 
     public:
-      Bar(int width, const std::string& fmt, bool lazy_builder_closing = true);
+      Bar(int width, std::string fmt, bool lazy_builder_closing = true);
       Bar(int width, bool lazy_builder_closing = true)
         : Bar(width, "<fill><indicator><empty>", lazy_builder_closing){}
 
@@ -38,5 +38,5 @@ namespace drawtypes
       std::string get_output(float percentage, bool floor_percentage = false);
   };
 
-  std::unique_ptr<Bar> get_config_bar(const std::string& config_path, const std::string& bar_name = "bar", bool lazy_builder_closing = true);
+  std::unique_ptr<Bar> get_config_bar(std::string config_path, std::string bar_name = "bar", bool lazy_builder_closing = true);
 }
diff --git a/include/drawtypes/icon.hpp b/include/drawtypes/icon.hpp
index 85304cbc..412986de 100644
--- a/include/drawtypes/icon.hpp
+++ b/include/drawtypes/icon.hpp
@@ -11,9 +11,9 @@ namespace drawtypes
 {
   struct Icon : public Label
   {
-    Icon(const std::string& icon, int font = 0)
+    Icon(std::string icon, int font = 0)
       : Label(icon, font){}
-    Icon(const std::string& icon, const std::string& fg, const std::string& bg = "", const std::string& ul = "", const std::string& ol = "", int font = 0, int padding = 0, int margin = 0)
+    Icon(std::string icon, std::string fg, std::string bg = "", std::string ul = "", std::string ol = "", int font = 0, int padding = 0, int margin = 0)
       : Label(icon, fg, bg, ul, ol, font, padding, margin){}
 
     std::unique_ptr<Icon> clone();
@@ -24,15 +24,15 @@ namespace drawtypes
     std::map<std::string, std::unique_ptr<Icon>> icons;
 
     public:
-      void add(const std::string& id, std::unique_ptr<Icon> &&icon);
-      std::unique_ptr<Icon> &get(const std::string& id, const std::string& fallback_id = "");
-      bool has(const std::string& id);
+      void add(std::string id, std::unique_ptr<Icon> &&icon);
+      std::unique_ptr<Icon> &get(std::string id, std::string fallback_id = "");
+      bool has(std::string id);
 
       operator bool() {
         return this->icons.size() > 0;
       }
   };
 
-  std::unique_ptr<Icon> get_config_icon(const std::string& module_name, const std::string& icon_name = "icon", bool required = true, const std::string& def = "");
-  std::unique_ptr<Icon> get_optional_config_icon(const std::string& module_name, const std::string& icon_name = "icon", const std::string& def = "");
+  std::unique_ptr<Icon> get_config_icon(std::string module_name, std::string icon_name = "icon", bool required = true, std::string def = "");
+  std::unique_ptr<Icon> get_optional_config_icon(std::string module_name, std::string icon_name = "icon", std::string def = "");
 }
diff --git a/include/drawtypes/label.hpp b/include/drawtypes/label.hpp
index 52cd8b7c..9825e43a 100644
--- a/include/drawtypes/label.hpp
+++ b/include/drawtypes/label.hpp
@@ -10,9 +10,9 @@ namespace drawtypes
     std::string text, fg, bg, ul, ol;
     int font = 0, padding = 0, margin = 0;
 
-    Label(const std::string& text, int font)
+    Label(std::string text, int font)
       : text(text), font(font){}
-    Label(const std::string& text, const std::string& fg = "", const std::string& bg = "", const std::string& ul = "", const std::string& ol = "", int font = 0, int padding = 0, int margin = 0)
+    Label(std::string text, std::string fg = "", std::string bg = "", std::string ul = "", std::string ol = "", int font = 0, int padding = 0, int margin = 0)
       : text(text), fg(fg), bg(bg), ul(ul), ol(ol), font(font), padding(padding), margin(margin){}
 
     operator bool() {
@@ -21,10 +21,10 @@ namespace drawtypes
 
     std::unique_ptr<Label> clone();
 
-    void replace_token(const std::string& token, const std::string& replacement);
+    void replace_token(std::string token, std::string replacement);
     void replace_defined_values(std::unique_ptr<Label> &label);
   };
 
-  std::unique_ptr<Label> get_config_label(const std::string& module_name, const std::string& label_name = "label", bool required = true, const std::string& def = "");
-  std::unique_ptr<Label> get_optional_config_label(const std::string& module_name, const std::string& label_name = "label", const std::string& def = "");
+  std::unique_ptr<Label> get_config_label(std::string module_name, std::string label_name = "label", bool required = true, std::string def = "");
+  std::unique_ptr<Label> get_optional_config_label(std::string module_name, std::string label_name = "label", std::string def = "");
 }
diff --git a/include/drawtypes/ramp.hpp b/include/drawtypes/ramp.hpp
index c76ba991..4bcb2fc1 100644
--- a/include/drawtypes/ramp.hpp
+++ b/include/drawtypes/ramp.hpp
@@ -27,5 +27,5 @@ namespace drawtypes
       }
   };
 
-  std::unique_ptr<Ramp> get_config_ramp(const std::string& module_name, const std::string& ramp_name = "ramp", bool required = true);
+  std::unique_ptr<Ramp> get_config_ramp(std::string module_name, std::string ramp_name = "ramp", bool required = true);
 }
diff --git a/include/eventloop.hpp b/include/eventloop.hpp
index fce07c7c..1d78d8bc 100644
--- a/include/eventloop.hpp
+++ b/include/eventloop.hpp
@@ -51,5 +51,5 @@ class EventLoop
 
     void cleanup(int timeout_ms = 5000);
 
-    void add_stdin_subscriber(const std::string& module_name);
+    void add_stdin_subscriber(std::string module_name);
 };
diff --git a/include/interfaces/alsa.hpp b/include/interfaces/alsa.hpp
index 057138a0..72490313 100644
--- a/include/interfaces/alsa.hpp
+++ b/include/interfaces/alsa.hpp
@@ -19,13 +19,13 @@ namespace alsa
   class Exception : public ::Exception
   {
     public:
-      explicit Exception(const std::string& msg) : ::Exception("[Alsa] "+ msg){}
+      explicit Exception(std::string msg) : ::Exception("[Alsa] "+ msg){}
   };
 
   class ControlInterfaceError : public Exception
   {
     public:
-      ControlInterfaceError(int code, const std::string& msg)
+      ControlInterfaceError(int code, std::string msg)
         : Exception(msg +" ["+ std::to_string(code) +"]") {}
   };
 
@@ -71,7 +71,7 @@ namespace alsa
     snd_mixer_elem_t *mixer_element = nullptr;
 
     public:
-      explicit Mixer(const std::string& mixer_control_name);
+      explicit Mixer(std::string mixer_control_name);
       ~Mixer();
       Mixer(const Mixer &) = delete;
       Mixer &operator=(const Mixer &) = delete;
@@ -86,7 +86,7 @@ namespace alsa
       bool is_muted();
 
     protected:
-      void error_handler(const std::string& message);
+      void error_handler(std::string message);
   };
 
   // }}}
diff --git a/include/interfaces/mpd.hpp b/include/interfaces/mpd.hpp
index 87737a5e..a1a6aa43 100644
--- a/include/interfaces/mpd.hpp
+++ b/include/interfaces/mpd.hpp
@@ -16,21 +16,21 @@ namespace mpd
   class Exception : public ::Exception
   {
     public:
-      Exception(const std::string& msg, bool clearable)
+      Exception(std::string msg, bool clearable)
         : ::Exception(msg + (clearable ? " (clearable)" : " (not clearable)")){}
   };
 
   class ClientError : public Exception
   {
     public:
-      explicit ClientError(const std::string& msg, mpd_error code, bool clearable)
+      explicit ClientError(std::string msg, mpd_error code, bool clearable)
         : Exception("[mpd::ClientError::"+ std::to_string(code) +"] "+ msg, clearable){}
   };
 
   class ServerError : public Exception
   {
     public:
-      ServerError(const std::string& msg, mpd_server_error code, bool clearable)
+      ServerError(std::string msg, mpd_server_error code, bool clearable)
         : Exception("[mpd::ServerError::"+ std::to_string(code) +"] "+ msg, clearable){}
   };
 
@@ -140,9 +140,9 @@ namespace mpd
       void idle();
       int noidle();
 
-      void set_host(const std::string& host) { this->host = host; }
+      void set_host(std::string host) { this->host = host; }
       void set_port(int port) { this->port = port; }
-      void set_password(const std::string& password) { this->password = password; }
+      void set_password(std::string password) { this->password = password; }
       void set_timeout(int timeout) { this->timeout = timeout; }
 
       std::unique_ptr<Status> get_status();
diff --git a/include/interfaces/net.hpp b/include/interfaces/net.hpp
index 193aea97..a866d837 100644
--- a/include/interfaces/net.hpp
+++ b/include/interfaces/net.hpp
@@ -13,14 +13,14 @@
 
 namespace net
 {
-  bool is_wireless_interface(const std::string& ifname);
+  bool is_wireless_interface(std::string ifname);
 
   // Network
 
   class NetworkException : public Exception
   {
     public:
-      explicit NetworkException(const std::string& msg)
+      explicit NetworkException(std::string msg)
         : Exception("[Network] "+ msg){}
   };
 
@@ -36,7 +36,7 @@ namespace net
       bool test_connection();
 
     public:
-      explicit Network(const std::string& interface);
+      explicit Network(std::string interface);
       ~Network();
 
       virtual bool connected();
@@ -56,7 +56,7 @@ namespace net
     int linkspeed = 0;
 
     public:
-      explicit WiredNetwork(const std::string& interface);
+      explicit WiredNetwork(std::string interface);
 
       std::string get_link_speed();
   };
@@ -72,7 +72,7 @@ namespace net
     struct iwreq iw;
 
     public:
-      explicit WirelessNetwork(const std::string& interface);
+      explicit WirelessNetwork(std::string interface);
 
       std::string get_essid();
       float get_signal_dbm();
diff --git a/include/lemonbuddy.hpp b/include/lemonbuddy.hpp
index 0536fe5c..641800d7 100644
--- a/include/lemonbuddy.hpp
+++ b/include/lemonbuddy.hpp
@@ -7,4 +7,4 @@ DefineBaseException(ApplicationError);
 void register_pid(pid_t pid);
 void unregister_pid(pid_t pid);
 
-void register_command_handler(const std::string& module_name);
+void register_command_handler(std::string module_name);
diff --git a/include/modules/backlight.hpp b/include/modules/backlight.hpp
index e03517fa..a179e8c6 100644
--- a/include/modules/backlight.hpp
+++ b/include/modules/backlight.hpp
@@ -24,10 +24,10 @@ namespace modules
     concurrency::Atomic<int> percentage;
 
     public:
-      explicit BacklightModule(const std::string& name);
+      explicit BacklightModule(std::string name);
 
       bool on_event(InotifyEvent *event);
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
       void idle() const
       {
diff --git a/include/modules/base.hpp b/include/modules/base.hpp
index 67e922c2..2382ef1c 100644
--- a/include/modules/base.hpp
+++ b/include/modules/base.hpp
@@ -42,7 +42,6 @@ class ModuleFormatter
     {
       std::string value;
       std::vector<std::string> tags;
-
       std::string fg, bg, ul, ol;
       int spacing, padding, margin, offset;
 
@@ -78,7 +77,7 @@ class ModuleFormatter
   std::map<std::string, std::unique_ptr<Format>> formats;
 
   public:
-    explicit ModuleFormatter(const std::string& module_name)
+    explicit ModuleFormatter(std::string module_name)
       : module_name(module_name) {}
 
     void add(const std::string& name, const std::string& fallback, std::vector<std::string> &&tags, std::vector<std::string> &&whitelist = {})
@@ -136,8 +135,8 @@ class ModuleFormatter
 
 namespace modules
 {
-  void broadcast_module_update(const std::string& module_name);
-  std::string get_tag_name(const std::string& tag);
+  void broadcast_module_update(std::string module_name);
+  std::string get_tag_name(std::string tag);
 
   struct ModuleInterface
   {
@@ -152,7 +151,7 @@ namespace modules
 
       virtual std::string operator()() = 0;
 
-      virtual bool handle_command(const std::string& cmd) = 0;
+      virtual bool handle_command(std::string cmd) = 0;
   };
 
   template<typename ModuleImpl>
@@ -219,7 +218,7 @@ namespace modules
         return this->cache();
       }
 
-      bool handle_command(const std::string& cmd) {
+      bool handle_command(std::string cmd) {
         return CastModule(ModuleImpl)->handle_command(cmd);
       }
 
@@ -309,7 +308,7 @@ namespace modules
         this->threads.emplace_back(std::thread(&StaticModule::broadcast, this));
       }
 
-      bool build(Builder *builder, const std::string& tag)
+      bool build(Builder *builder, std::string tag)
       {
         return true;
       }
@@ -336,7 +335,7 @@ namespace modules
 
     public:
       template<typename I>
-      TimerModule(const std::string& name, I const &interval)
+      TimerModule(std::string name, I const &interval)
         : Module<ModuleImpl>(name), interval(interval) {}
 
       void start()
diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index 73ed8d0c..3ae87533 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -49,12 +49,12 @@ namespace modules
       void subthread_routine();
 
     public:
-      explicit BatteryModule(const std::string& name);
+      explicit BatteryModule(std::string name);
 
       void start();
 
       bool on_event(InotifyEvent *event);
       std::string get_format();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
   };
 }
diff --git a/include/modules/bspwm.hpp b/include/modules/bspwm.hpp
index 1133c054..e9146289 100644
--- a/include/modules/bspwm.hpp
+++ b/include/modules/bspwm.hpp
@@ -66,13 +66,13 @@ namespace modules
     std::string prev_data;
 
     public:
-      BspwmModule(const std::string& name, const std::string& monitor);
+      BspwmModule(std::string name, std::string monitor);
       ~BspwmModule() { close(this->socket_fd); }
 
       void start();
       bool has_event();
       bool update();
-      bool build(Builder *builder, const std::string& tag);
-      bool handle_command(const std::string& cmd);
+      bool build(Builder *builder, std::string tag);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/modules/counter.hpp b/include/modules/counter.hpp
index 42291f69..ecb044a7 100644
--- a/include/modules/counter.hpp
+++ b/include/modules/counter.hpp
@@ -11,9 +11,9 @@ namespace modules
     concurrency::Atomic<int> counter;
 
     public:
-      explicit CounterModule(const std::string& name);
+      explicit CounterModule(std::string name);
 
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
   };
 }
diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp
index b7a7313d..f1cb1fe2 100644
--- a/include/modules/cpu.hpp
+++ b/include/modules/cpu.hpp
@@ -43,9 +43,9 @@ namespace modules
     float get_load(int core);
 
     public:
-      explicit CpuModule(const std::string& name);
+      explicit CpuModule(std::string name);
 
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
   };
 }
diff --git a/include/modules/date.hpp b/include/modules/date.hpp
index e804f1e6..b237088d 100644
--- a/include/modules/date.hpp
+++ b/include/modules/date.hpp
@@ -19,12 +19,12 @@ namespace modules
     bool detailed = false;
 
     public:
-      explicit DateModule(const std::string& name);
+      explicit DateModule(std::string name);
 
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
       std::string get_output();
-      bool handle_command(const std::string& cmd);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/modules/i3.hpp b/include/modules/i3.hpp
index 973c7a19..c9ae4670 100644
--- a/include/modules/i3.hpp
+++ b/include/modules/i3.hpp
@@ -63,15 +63,15 @@ namespace modules
     int ipc_fd = -1;
 
     public:
-      i3Module(const std::string& name, const std::string& monitor);
+      i3Module(std::string name, std::string monitor);
 
       void start();
       void stop();
 
       bool has_event();
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
-      bool handle_command(const std::string& cmd);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/modules/memory.hpp b/include/modules/memory.hpp
index 2bdd4bea..fad050ca 100644
--- a/include/modules/memory.hpp
+++ b/include/modules/memory.hpp
@@ -24,9 +24,9 @@ namespace modules
     std::atomic<int> percentage_free;
 
     public:
-      explicit MemoryModule(const std::string& name);
+      explicit MemoryModule(std::string name);
 
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
   };
 }
diff --git a/include/modules/menu.hpp b/include/modules/menu.hpp
index 0c5671ef..2313fa01 100644
--- a/include/modules/menu.hpp
+++ b/include/modules/menu.hpp
@@ -33,12 +33,12 @@ namespace modules
     std::unique_ptr<drawtypes::Label> label_close;
 
     public:
-      explicit MenuModule(const std::string& name);
+      explicit MenuModule(std::string name);
 
       std::string get_output();
 
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
-      bool handle_command(const std::string& cmd);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp
index f5ab166a..f3f99540 100644
--- a/include/modules/mpd.hpp
+++ b/include/modules/mpd.hpp
@@ -65,15 +65,15 @@ namespace modules
     std::string progress_fill, progress_empty, progress_indicator;
 
     public:
-      explicit MpdModule(const std::string& name);
+      explicit MpdModule(std::string name);
       ~MpdModule();
 
       void start();
       bool has_event();
       bool update();
       std::string get_format();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
-      bool handle_command(const std::string& cmd);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/modules/network.hpp b/include/modules/network.hpp
index 9d9c7fa8..8cb4aeb5 100644
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@@ -50,14 +50,14 @@ namespace modules
     void subthread_routine();
 
     public:
-      explicit NetworkModule(const std::string& name);
+      explicit NetworkModule(std::string name);
 
       void start();
       bool update();
 
       std::string get_format();
 
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
   };
 }
diff --git a/include/modules/script.hpp b/include/modules/script.hpp
index 9b8ad8f5..9dc4cbf9 100644
--- a/include/modules/script.hpp
+++ b/include/modules/script.hpp
@@ -27,11 +27,11 @@ namespace modules
     protected:
 
     public:
-      explicit ScriptModule(const std::string& name);
+      explicit ScriptModule(std::string name);
 
       void start();
       bool update();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
       std::string get_output();
   };
 }
diff --git a/include/modules/text.hpp b/include/modules/text.hpp
index e8116d72..cfc51b6f 100644
--- a/include/modules/text.hpp
+++ b/include/modules/text.hpp
@@ -9,7 +9,7 @@ namespace modules
     static constexpr auto FORMAT = "content";
 
     public:
-      explicit TextModule(const std::string& name);
+      explicit TextModule(std::string name);
 
       std::string get_format();
       std::string get_output();
diff --git a/include/modules/volume.hpp b/include/modules/volume.hpp
index d38f1dcb..499199be 100644
--- a/include/modules/volume.hpp
+++ b/include/modules/volume.hpp
@@ -43,16 +43,15 @@ namespace modules
     concurrency::Atomic<bool> has_changed;
 
     public:
-      explicit VolumeModule(const std::string& name);
-      ~VolumeModule();
+      explicit VolumeModule(std::string name);
 
       bool has_event();
       bool update();
 
       std::string get_format();
-      bool build(Builder *builder, const std::string& tag);
+      bool build(Builder *builder, std::string tag);
 
       std::string get_output();
-      bool handle_command(const std::string& cmd);
+      bool handle_command(std::string cmd);
   };
 }
diff --git a/include/registry.hpp b/include/registry.hpp
index e7f4c5df..1340f46b 100644
--- a/include/registry.hpp
+++ b/include/registry.hpp
@@ -40,9 +40,9 @@ class Registry
     void load();
     void unload();
     bool wait();
-    void notify(const std::string& module_name);
-    std::string get(const std::string& module_name);
-    std::unique_ptr<RegistryModuleEntry>& find(const std::string& module_name);
+    void notify(std::string module_name);
+    std::string get(std::string module_name);
+    std::unique_ptr<RegistryModuleEntry>& find(std::string module_name);
 };
 
 std::shared_ptr<Registry> &get_registry();
diff --git a/include/services/builder.hpp b/include/services/builder.hpp
index 32f9e224..eb4674bf 100644
--- a/include/services/builder.hpp
+++ b/include/services/builder.hpp
@@ -34,7 +34,7 @@ class Builder
     int T_value = 1;
     std::string B_value = "", F_value = "", U_value = "";
 
-    void tag_open(char tag, const std::string& value);
+    void tag_open(char tag, std::string value);
     void tag_close(char tag);
 
     void align_left();
@@ -48,11 +48,11 @@ class Builder
 
     std::string flush();
 
-    void append(const std::string& node);
-    void append_module_output(Alignment alignment, const std::string& module_output, bool margin_left = true, bool margin_right = true);
+    void append(std::string node);
+    void append_module_output(Alignment alignment, std::string module_output, bool margin_left = true, bool margin_right = true);
 
-    void node(const std::string& str, bool add_space = false);
-    void node(const std::string& str, int font_index, bool add_space = false);
+    void node(std::string str, bool add_space = false);
+    void node(std::string str, int font_index, bool add_space = false);
 
     void node(drawtypes::Bar *bar, float percentage, bool add_space = false);
     void node(std::unique_ptr<drawtypes::Bar> &bar, float percentage, bool add_space = false);
@@ -76,20 +76,20 @@ class Builder
     void font(int index);
     void font_close(bool force = false);
 
-    void background(const std::string& color);
+    void background(std::string color);
     void background_close(bool force = false);
 
-    void color(const std::string& color);
-    void color_alpha(const std::string& alpha);
+    void color(std::string color);
+    void color_alpha(std::string alpha);
     void color_close(bool force = false);
 
-    void line_color(const std::string& color);
+    void line_color(std::string color);
     void line_color_close(bool force = false);
 
-    void overline(const std::string& color = "");
+    void overline(std::string color = "");
     void overline_close(bool force = false);
 
-    void underline(const std::string& color = "");
+    void underline(std::string color = "");
     void underline_close(bool force = false);
 
     // void invert();
diff --git a/include/services/command.hpp b/include/services/command.hpp
index 6f3e0e72..8af3d49d 100644
--- a/include/services/command.hpp
+++ b/include/services/command.hpp
@@ -22,14 +22,14 @@ class Command
     int fork_status;
 
   public:
-    Command(const std::string& cmd, int stdout[2] = nullptr, int stdin[2] = nullptr);
+    Command(std::string cmd, int stdout[2] = nullptr, int stdin[2] = nullptr);
     ~Command();
 
     int exec(bool wait_for_completion = true);
     int wait();
 
     void tail(std::function<void(std::string)> callback);
-    int writeline(const std::string& data);
+    int writeline(std::string data);
 
     int get_stdout(int);
     // int get_stdin(int);
diff --git a/include/services/inotify.hpp b/include/services/inotify.hpp
index 42223812..66adb274 100644
--- a/include/services/inotify.hpp
+++ b/include/services/inotify.hpp
@@ -8,7 +8,7 @@
 class InotifyException : public Exception
 {
   public:
-    explicit InotifyException(const std::string& msg)
+    explicit InotifyException(std::string msg)
       : Exception("[Inotify] "+ msg){}
 };
 
@@ -48,7 +48,7 @@ class InotifyWatch
   int fd = -1, wd = -1, mask;
 
   public:
-    explicit InotifyWatch(const std::string& path, int mask = InotifyEvent::ALL);
+    explicit InotifyWatch(std::string path, int mask = InotifyEvent::ALL);
     ~InotifyWatch();
 
     std::string operator()() {
diff --git a/include/services/store.hpp b/include/services/store.hpp
index 90dafe45..d2b65b99 100644
--- a/include/services/store.hpp
+++ b/include/services/store.hpp
@@ -31,7 +31,7 @@ struct Store
 
   std::string get_string();
   std::string &get_string(std::string& s);
-  void set_string(const std::string& s);
+  void set_string(std::string s);
 
   Store(int size);
   ~Store() {}
diff --git a/include/utils/cli.hpp b/include/utils/cli.hpp
index d74ea584..0eae6b00 100644
--- a/include/utils/cli.hpp
+++ b/include/utils/cli.hpp
@@ -16,23 +16,23 @@ namespace cli
     std::string help;
     std::vector<std::string> accept;
 
-    Option(const std::string& flag_short, const std::string& flag_long, const std::string& placeholder, std::vector<std::string> accept, std::string help)
+    Option(std::string flag_short, std::string flag_long, std::string placeholder, std::vector<std::string> accept, std::string help)
       : flag_short(flag_short), flag_long(flag_long), placeholder(placeholder), help(help), accept(accept){}
   };
 
-  void add_option(const std::string& opt_short, const std::string& opt_long, const std::string& help);
-  void add_option(const std::string& opt_short, const std::string& opt_long, const std::string& placeholder, const std::string& help, std::vector<std::string> accept = {});
+  void add_option(std::string opt_short, std::string opt_long, std::string help);
+  void add_option(std::string opt_short, std::string opt_long, std::string placeholder, std::string help, std::vector<std::string> accept = {});
 
-  bool is_option(char *opt, const std::string& opt_short, const std::string& opt_long);
-  bool is_option_short(char *opt, const std::string& opt_short);
-  bool is_option_long(char *opt, const std::string& opt_long);
+  bool is_option(char *opt, std::string opt_short, std::string opt_long);
+  bool is_option_short(char *opt, std::string opt_short);
+  bool is_option_long(char *opt, std::string opt_long);
 
   std::string parse_option_value(int &i, int argc, char **argv, std::vector<std::string> accept = {});
-  bool has_option(const std::string& opt);
-  std::string get_option_value(const std::string& opt);
-  bool match_option_value(const std::string& opt, const std::string& val);
+  bool has_option(std::string opt);
+  std::string get_option_value(std::string opt);
+  bool match_option_value(std::string opt, std::string val);
 
   void parse(int i, int argc, char **argv);
 
-  void usage(const std::string& usage, bool exit_success = true);
+  void usage(std::string usage, bool exit_success = true);
 }
diff --git a/include/utils/config.hpp b/include/utils/config.hpp
index bf303eca..800c3805 100644
--- a/include/utils/config.hpp
+++ b/include/utils/config.hpp
@@ -21,20 +21,20 @@ namespace config
   static std::recursive_mutex mtx;
 
   std::string get_bar_path();
-  void set_bar_path(const std::string& path);
+  void set_bar_path(std::string path);
 
-  void load(const std::string& path);
-  void load(const char *dir, const std::string& path);
+  void load(std::string path);
+  void load(const char *dir, std::string path);
   // void reload();
 
   boost::property_tree::ptree get_tree();
 
-  std::string build_path(const std::string& section, const std::string& key);
+  std::string build_path(std::string section, std::string key);
 
   std::string get_file_path();
 
   template<typename T>
-  T dereference_var(const std::string& ref_section, const std::string& ref_key, const std::string& var, const T ref_val)
+  T dereference_var(std::string ref_section, std::string ref_key, std::string var, const T ref_val)
   {
     std::lock_guard<std::recursive_mutex> lck(config::mtx);
 
@@ -63,7 +63,7 @@ namespace config
   }
 
   template<typename T>
-  T get(const std::string& section, const std::string& key)
+  T get(std::string section, std::string key)
   {
     std::lock_guard<std::recursive_mutex> lck(config::mtx);
 
@@ -78,7 +78,7 @@ namespace config
   }
 
   template<typename T>
-  T get(const std::string& section, const std::string& key, T default_value)
+  T get(std::string section, std::string key, T default_value)
   {
     std::lock_guard<std::recursive_mutex> lck(config::mtx);
 
@@ -89,7 +89,7 @@ namespace config
   }
 
   template<typename T>
-  std::vector<T> get_list(const std::string& section, const std::string& key)
+  std::vector<T> get_list(std::string section, std::string key)
   {
     std::lock_guard<std::recursive_mutex> lck(config::mtx);
 
@@ -108,7 +108,7 @@ namespace config
   }
 
   template<typename T>
-  std::vector<T> get_list(const std::string& section, const std::string& key, std::vector<T> default_value)
+  std::vector<T> get_list(std::string section, std::string key, std::vector<T> default_value)
   {
     std::lock_guard<std::recursive_mutex> lck(config::mtx);
 
diff --git a/include/utils/io.hpp b/include/utils/io.hpp
index 81d664d9..f5ed3389 100644
--- a/include/utils/io.hpp
+++ b/include/utils/io.hpp
@@ -13,8 +13,8 @@ namespace io
 {
   namespace socket
   {
-    int open(const std::string& path);
-    int send(int fd, const std::string& data, int flags = 0);
+    int open(std::string path);
+    int send(int fd, std::string data, int flags = 0);
     int recv(int fd, char *buffer, int recv_bytes, int flags = 0);
   }
 
@@ -28,7 +28,7 @@ namespace io
         std::string path;
         std::string mode;
 
-        FilePtr(const std::string& path, const std::string& mode = "a+")
+        FilePtr(std::string path, std::string mode = "a+")
           : path(std::string(path)), mode(std::string(mode))
         {
           this->fptr = fopen(this->path.c_str(), this->mode.c_str());
@@ -49,11 +49,11 @@ namespace io
         }
     };
 
-    bool exists(const std::string& fname);
-    std::string get_contents(const std::string& fname);
-    bool is_fifo(const std::string& fname);
-    std::size_t write(FilePtr *fptr, const std::string& data);
-    std::size_t write(const std::string& fpath, const std::string& data);
+    bool exists(std::string fname);
+    std::string get_contents(std::string fname);
+    bool is_fifo(std::string fname);
+    std::size_t write(FilePtr *fptr, std::string data);
+    std::size_t write(std::string fpath, std::string data);
   }
 
   std::string read(int read_fd, int bytes_to_read = -1);
@@ -61,8 +61,8 @@ namespace io
   std::string readline(int read_fd, int &bytes_read);
   std::string readline(int read_fd);
 
-  int write(int write_fd, const std::string& data);
-  int writeline(int write_fd, const std::string& data);
+  int write(int write_fd, std::string data);
+  int writeline(int write_fd, std::string data);
 
   void tail(int read_fd, std::function<void(std::string)> callback);
   void tail(int read_fd, int writeback_fd);
diff --git a/include/utils/proc.hpp b/include/utils/proc.hpp
index a33b82a7..5eba338f 100644
--- a/include/utils/proc.hpp
+++ b/include/utils/proc.hpp
@@ -24,7 +24,7 @@ namespace proc
 
   pid_t fork();
   bool pipe(int fds[2]);
-  void exec(const std::string& cmd);
+  void exec(std::string cmd);
 
   bool kill(pid_t pid, int sig = SIGTERM);
 
diff --git a/include/utils/string.hpp b/include/utils/string.hpp
index 495329b7..abcceb9f 100644
--- a/include/utils/string.hpp
+++ b/include/utils/string.hpp
@@ -5,27 +5,27 @@
 
 namespace string
 {
-  bool compare(const std::string& s1, const std::string& s2);
+  bool compare(std::string s1, std::string s2);
 
-  // std::string upper(const std::string& s);
-  std::string lower(const std::string& s);
+  // std::string upper(std::string s);
+  std::string lower(std::string s);
 
-  std::string replace(const std::string& haystack, const std::string& needle, const std::string& replacement);
-  std::string replace_all(const std::string& haystack, const std::string& needle, const std::string& replacement);
+  std::string replace(std::string haystack, std::string needle, std::string replacement);
+  std::string replace_all(std::string haystack, std::string needle, std::string replacement);
 
-  std::string squeeze(const std::string& haystack, const char &needle);
+  std::string squeeze(std::string haystack, const char &needle);
 
-  // std::string strip(const std::string& haystack, const char &needle);
-  std::string strip_trailing_newline(const std::string& s);
+  // std::string strip(std::string haystack, const char &needle);
+  std::string strip_trailing_newline(std::string s);
 
-  std::string trim(const std::string& haystack, const char &needle);
-  std::string ltrim(const std::string& haystack, const char &needle);
-  std::string rtrim(const std::string& haystack, const char &needle);
+  std::string trim(std::string haystack, const char &needle);
+  std::string ltrim(std::string haystack, const char &needle);
+  std::string rtrim(std::string haystack, const char &needle);
 
-  std::string join(const std::vector<std::string> &strs, const std::string& delim);
+  std::string join(const std::vector<std::string> &strs, std::string delim);
 
-  std::vector<std::string> split(const std::string& s, const char &delim);
-  std::vector<std::string> &split_into(const std::string& s, const char &delim, std::vector<std::string> &elems);
+  std::vector<std::string> split(std::string s, const char &delim);
+  std::vector<std::string> &split_into(std::string s, const char &delim, std::vector<std::string> &elems);
 
-  std::size_t find_nth(const std::string& haystack, std::size_t pos, const std::string& needle, std::size_t nth);
+  std::size_t find_nth(std::string haystack, std::size_t pos, std::string needle, std::size_t nth);
 }
diff --git a/include/utils/xlib.hpp b/include/utils/xlib.hpp
index be69916b..f03aa124 100644
--- a/include/utils/xlib.hpp
+++ b/include/utils/xlib.hpp
@@ -25,7 +25,7 @@ namespace xlib
     }
   };
 
-  // std::unique_ptr<Monitor> get_monitor(const std::string& monitor_name);
+  // std::unique_ptr<Monitor> get_monitor(std::string monitor_name);
 
   std::vector<std::unique_ptr<Monitor>> get_sorted_monitorlist();
 }
diff --git a/src/drawtypes/animation.cpp b/src/drawtypes/animation.cpp
index bcfa0d32..54fe2388 100644
--- a/src/drawtypes/animation.cpp
+++ b/src/drawtypes/animation.cpp
@@ -7,7 +7,7 @@
 
 namespace drawtypes
 {
-  std::unique_ptr<Animation> get_config_animation(const std::string& config_path, const std::string& animation_name, bool required)
+  std::unique_ptr<Animation> get_config_animation(std::string config_path, std::string animation_name, bool required)
   {
     std::vector<std::unique_ptr<Icon>> vec;
     std::vector<std::string> frames;
diff --git a/src/drawtypes/bar.cpp b/src/drawtypes/bar.cpp
index b00247a1..e97787d7 100644
--- a/src/drawtypes/bar.cpp
+++ b/src/drawtypes/bar.cpp
@@ -7,7 +7,7 @@
 
 namespace drawtypes
 {
-  std::unique_ptr<Bar> get_config_bar(const std::string& config_path, const std::string& bar_name, bool lazy_builder_closing)
+  std::unique_ptr<Bar> get_config_bar(std::string config_path, std::string bar_name, bool lazy_builder_closing)
   {
     std::unique_ptr<Bar> bar;
 
@@ -28,7 +28,7 @@ namespace drawtypes
     return bar;
   }
 
-  Bar::Bar(int width, const std::string& fmt, bool lazy_builder_closing)
+  Bar::Bar(int width, std::string fmt, bool lazy_builder_closing)
     : builder(std::make_unique<Builder>(lazy_builder_closing)), format(fmt)
   {
     this->width = width;
diff --git a/src/drawtypes/icon.cpp b/src/drawtypes/icon.cpp
index cab51592..dc615fd4 100644
--- a/src/drawtypes/icon.cpp
+++ b/src/drawtypes/icon.cpp
@@ -9,24 +9,24 @@ namespace drawtypes
       this->text, this->fg, this->bg, this->ul, this->ol, this->font, this->padding, this->margin) };
   }
 
-  std::unique_ptr<Icon> get_config_icon(const std::string& config_path, const std::string& icon_name, bool required, const std::string& def)
+  std::unique_ptr<Icon> get_config_icon(std::string config_path, std::string icon_name, bool required, std::string def)
   {
     auto label = get_config_label(config_path, icon_name, required, def);
     return std::unique_ptr<Icon> { new Icon(label->text, label->fg, label->bg, label->ul, label->ol, label->font) };
   }
 
-  std::unique_ptr<Icon> get_optional_config_icon(const std::string& config_path, const std::string& icon_name, const std::string& def) {
+  std::unique_ptr<Icon> get_optional_config_icon(std::string config_path, std::string icon_name, std::string def) {
     return get_config_icon(config_path, icon_name, false, def);
   }
 
 
   // IconMap
 
-  void IconMap::add(const std::string& id, std::unique_ptr<Icon> &&icon) {
+  void IconMap::add(std::string id, std::unique_ptr<Icon> &&icon) {
     this->icons.insert(std::make_pair(id, std::move(icon)));
   }
 
-  std::unique_ptr<Icon> &IconMap::get(const std::string& id, const std::string& fallback_id)
+  std::unique_ptr<Icon> &IconMap::get(std::string id, std::string fallback_id)
   {
     auto icon = this->icons.find(id);
     if (icon == this->icons.end())
@@ -34,7 +34,7 @@ namespace drawtypes
     return icon->second;
   }
 
-  bool IconMap::has(const std::string& id) {
+  bool IconMap::has(std::string id) {
     return this->icons.find(id) != this->icons.end();
   }
 }
diff --git a/src/drawtypes/label.cpp b/src/drawtypes/label.cpp
index 2cebed45..7811f7c4 100644
--- a/src/drawtypes/label.cpp
+++ b/src/drawtypes/label.cpp
@@ -9,7 +9,7 @@ namespace drawtypes
       this->text, this->fg, this->bg, this->ul, this->ol, this->font, this->padding, this->margin) };
   }
 
-  void Label::replace_token(const std::string& token, const std::string& replacement) {
+  void Label::replace_token(std::string token, std::string replacement) {
     this->text = string::replace_all(this->text, token, replacement);
   }
 
@@ -21,7 +21,7 @@ namespace drawtypes
     if (!label->ol.empty()) this->ol = label->ol;
   }
 
-  std::unique_ptr<Label> get_config_label(const std::string& config_path, const std::string& label_name, bool required, const std::string& def)
+  std::unique_ptr<Label> get_config_label(std::string config_path, std::string label_name, bool required, std::string def)
   {
     std::string label;
 
@@ -40,7 +40,7 @@ namespace drawtypes
       config::get<int>(config_path, label_name +"-margin", 0)) };
   }
 
-  std::unique_ptr<Label> get_optional_config_label(const std::string& config_path, const std::string& label_name, const std::string& def) {
+  std::unique_ptr<Label> get_optional_config_label(std::string config_path, std::string label_name, std::string def) {
     return get_config_label(config_path, label_name, false, def);
   }
 }
diff --git a/src/drawtypes/ramp.cpp b/src/drawtypes/ramp.cpp
index 51d47ac9..9000ba2a 100644
--- a/src/drawtypes/ramp.cpp
+++ b/src/drawtypes/ramp.cpp
@@ -4,7 +4,7 @@
 
 namespace drawtypes
 {
-  std::unique_ptr<Ramp> get_config_ramp(const std::string& config_path, const std::string& ramp_name, bool required)
+  std::unique_ptr<Ramp> get_config_ramp(std::string config_path, std::string ramp_name, bool required)
   {
     std::vector<std::unique_ptr<Icon>> vec;
     std::vector<std::string> icons;
diff --git a/src/eventloop.cpp b/src/eventloop.cpp
index f35d0a8f..e259db39 100644
--- a/src/eventloop.cpp
+++ b/src/eventloop.cpp
@@ -98,7 +98,7 @@ void EventLoop::wait()
   this->logger->info("Termination signal received... Shutting down");
 }
 
-void EventLoop::add_stdin_subscriber(const std::string& module_name)
+void EventLoop::add_stdin_subscriber(std::string module_name)
 {
   // this->stdin_subs.insert(std::make_pair("TAG", module_name));
   this->stdin_subs.emplace_back(module_name);
diff --git a/src/interfaces/alsa.cpp b/src/interfaces/alsa.cpp
index 8266e8ef..d0054a81 100644
--- a/src/interfaces/alsa.cpp
+++ b/src/interfaces/alsa.cpp
@@ -87,7 +87,7 @@ namespace alsa
   // }}}
   // Mixer {{{
 
-  Mixer::Mixer(const std::string& mixer_control_name)
+  Mixer::Mixer(std::string mixer_control_name)
   {
     snd_mixer_selem_id_t *mixer_id;
 
diff --git a/src/interfaces/net.cpp b/src/interfaces/net.cpp
index 85602fb6..cf9c0096 100644
--- a/src/interfaces/net.cpp
+++ b/src/interfaces/net.cpp
@@ -20,14 +20,14 @@
 
 using namespace net;
 
-bool net::is_wireless_interface(const std::string& ifname) {
+bool net::is_wireless_interface(std::string ifname) {
   return io::file::exists("/sys/class/net/"+ ifname +"/wireless");
 }
 
 
 // Network
 
-Network::Network(const std::string& interface)
+Network::Network(std::string interface)
   : interface(interface)
 {
   if (if_nametoindex(this->interface.c_str()) == 0)
@@ -108,7 +108,7 @@ std::string Network::get_ip()
 
 // WiredNetwork
 
-WiredNetwork::WiredNetwork(const std::string& interface) : Network(interface)
+WiredNetwork::WiredNetwork(std::string interface) : Network(interface)
 {
   struct ethtool_cmd e;
 
@@ -127,7 +127,7 @@ std::string WiredNetwork::get_link_speed() {
 
 // WirelessNetwork
 
-WirelessNetwork::WirelessNetwork(const std::string& interface) : Network(interface) {
+WirelessNetwork::WirelessNetwork(std::string interface) : Network(interface) {
   std::strcpy((char *) &this->iw.ifr_ifrn.ifrn_name, this->interface.c_str());
 }
 
diff --git a/src/lemonbuddy.cpp b/src/lemonbuddy.cpp
index 9be22c70..d921f732 100644
--- a/src/lemonbuddy.cpp
+++ b/src/lemonbuddy.cpp
@@ -38,7 +38,7 @@ void unregister_pid(pid_t pid) {
   std::lock_guard<std::mutex> lck(pid_mtx);
   pids.erase(std::remove(pids.begin(), pids.end(), pid), pids.end());
 }
-void register_command_handler(const std::string& module_name) {
+void register_command_handler(std::string module_name) {
   eventloop->add_stdin_subscriber(module_name);
 }
 
@@ -191,7 +191,8 @@ int main(int argc, char **argv)
   if (eventloop)
     eventloop->cleanup();
 
-  while (proc::wait_for_completion_nohang() > 0);
+  while (proc::wait_for_completion_nohang() > 0)
+    ;
 
   log_trace("Reached end of application");
 
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index 3548e2ef..0f0609ee 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -4,7 +4,7 @@
 
 using namespace modules;
 
-BacklightModule::BacklightModule(const std::string& name_) : InotifyModule(name_)
+BacklightModule::BacklightModule(std::string name_) : InotifyModule(name_)
 {
   // Load configuration values
   auto card = config::get<std::string>(name(), "card");
@@ -57,7 +57,7 @@ bool BacklightModule::on_event(InotifyEvent *event)
   return true;
 }
 
-bool BacklightModule::build(Builder *builder, const std::string& tag)
+bool BacklightModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_BAR)
     builder->node(this->bar, this->percentage());
diff --git a/src/modules/base.cpp b/src/modules/base.cpp
index 5c8756f9..271b186c 100644
--- a/src/modules/base.cpp
+++ b/src/modules/base.cpp
@@ -6,12 +6,13 @@
 
 namespace modules
 {
-  void broadcast_module_update(const std::string& module_name) {
+  void broadcast_module_update(std::string module_name)
+  {
     log_trace("Broadcasting module update for => "+ module_name);
     get_registry()->notify(module_name);
   }
 
-  std::string get_tag_name(const std::string& tag) {
+  std::string get_tag_name(std::string tag) {
     return tag.length() < 2 ? "" : tag.substr(1, tag.length()-2);
   }
 }
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index eeea1cb9..9f9101d1 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -17,7 +17,7 @@ const int modules::BatteryModule::STATE_CHARGING;
 const int modules::BatteryModule::STATE_DISCHARGING;
 const int modules::BatteryModule::STATE_FULL;
 
-BatteryModule::BatteryModule(const std::string& name_) : InotifyModule(name_)
+BatteryModule::BatteryModule(std::string name_) : InotifyModule(name_)
 {
   this->battery = config::get<std::string>(name(), "battery", "BAT0");
   this->adapter = config::get<std::string>(name(), "adapter", "ADP1");
@@ -179,7 +179,7 @@ std::string BatteryModule::get_format()
     return FORMAT_DISCHARGING;
 }
 
-bool BatteryModule::build(Builder *builder, const std::string& tag)
+bool BatteryModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_ANIMATION_CHARGING)
     builder->node(this->animation_charging);
diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index f664cebd..ca701ca1 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -17,7 +17,7 @@ using namespace Bspwm;
 #define DEFAULT_WS_ICON "workspace_icon-default"
 #define DEFAULT_WS_LABEL "%icon%  %name%"
 
-BspwmModule::BspwmModule(const std::string& name_, const std::string& monitor)
+BspwmModule::BspwmModule(std::string name_, std::string monitor)
   : EventModule(name_), monitor(monitor)
 {
   this->formatter->add(DEFAULT_FORMAT, TAG_LABEL_STATE, { TAG_LABEL_STATE }, { TAG_LABEL_MODE });
@@ -193,7 +193,7 @@ bool BspwmModule::update()
   return true;
 }
 
-bool BspwmModule::build(Builder *builder, const std::string& tag)
+bool BspwmModule::build(Builder *builder, std::string tag)
 {
   if (tag != TAG_LABEL_STATE)
     return false;
@@ -218,7 +218,7 @@ bool BspwmModule::build(Builder *builder, const std::string& tag)
   return true;
 }
 
-bool BspwmModule::handle_command(const std::string& cmd)
+bool BspwmModule::handle_command(std::string cmd)
 {
   if (cmd.find(EVENT_CLICK) == std::string::npos || cmd.length() <= std::strlen(EVENT_CLICK))
     return false;
diff --git a/src/modules/counter.cpp b/src/modules/counter.cpp
index 5ac45431..31191acd 100644
--- a/src/modules/counter.cpp
+++ b/src/modules/counter.cpp
@@ -6,7 +6,7 @@
 
 using namespace modules;
 
-CounterModule::CounterModule(const std::string& module_name) : TimerModule(module_name, 1s)
+CounterModule::CounterModule(std::string module_name) : TimerModule(module_name, 1s)
 {
   this->interval = std::chrono::duration<double>(
     config::get<float>(name(), "interval", 1));
@@ -22,7 +22,7 @@ bool CounterModule::update()
   return true;
 }
 
-bool CounterModule::build(Builder *builder, const std::string& tag)
+bool CounterModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_COUNTER) {
     builder->node(std::to_string(this->counter()));
diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp
index e318d0ac..95da4c66 100644
--- a/src/modules/cpu.cpp
+++ b/src/modules/cpu.cpp
@@ -7,7 +7,7 @@
 
 using namespace modules;
 
-CpuModule::CpuModule(const std::string& name_) : TimerModule(name_, 1s)
+CpuModule::CpuModule(std::string name_) : TimerModule(name_, 1s)
 {
   this->interval = std::chrono::duration<double>(
     config::get<float>(name(), "interval", 1));
@@ -60,7 +60,7 @@ bool CpuModule::update()
   return true;
 }
 
-bool CpuModule::build(Builder *builder, const std::string& tag)
+bool CpuModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_LABEL)
     builder->node(this->label_tokenized);
diff --git a/src/modules/date.cpp b/src/modules/date.cpp
index 24e32db4..35b77d92 100644
--- a/src/modules/date.cpp
+++ b/src/modules/date.cpp
@@ -6,7 +6,7 @@
 
 using namespace modules;
 
-DateModule::DateModule(const std::string& name_)
+DateModule::DateModule(std::string name_)
   : TimerModule(name_, 1s), builder(std::make_unique<Builder>())
 {
   this->interval = std::chrono::duration<double>(
@@ -42,14 +42,14 @@ std::string DateModule::get_output()
   return this->builder->flush();
 }
 
-bool DateModule::build(Builder *builder, const std::string& tag)
+bool DateModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_DATE)
     builder->node(this->date_str);
   return tag == TAG_DATE;
 }
 
-bool DateModule::handle_command(const std::string& cmd)
+bool DateModule::handle_command(std::string cmd)
 {
   if (cmd == EVENT_TOGGLE) {
     this->detailed = !this->detailed;
diff --git a/src/modules/i3.cpp b/src/modules/i3.cpp
index 9cfad470..e95bb141 100644
--- a/src/modules/i3.cpp
+++ b/src/modules/i3.cpp
@@ -22,7 +22,7 @@ using namespace modules;
 // TODO: Needs more testing
 // TODO: Add mode indicators
 
-i3Module::i3Module(const std::string& name_, const std::string& monitor) : EventModule(name_)
+i3Module::i3Module(std::string name_, std::string monitor) : EventModule(name_)
 {
   try {
     this->ipc = std::make_unique<i3ipc::connection>();
@@ -152,7 +152,7 @@ bool i3Module::update()
   return true;
 }
 
-bool i3Module::build(Builder *builder, const std::string& tag)
+bool i3Module::build(Builder *builder, std::string tag)
 {
   if (tag != TAG_LABEL_STATE)
     return false;
@@ -166,7 +166,7 @@ bool i3Module::build(Builder *builder, const std::string& tag)
   return true;
 }
 
-bool i3Module::handle_command(const std::string& cmd)
+bool i3Module::handle_command(std::string cmd)
 {
   if (cmd.find(EVENT_CLICK) == std::string::npos || cmd.length() < std::strlen(EVENT_CLICK))
     return false;
diff --git a/src/modules/memory.cpp b/src/modules/memory.cpp
index c6069301..40e7bf7c 100644
--- a/src/modules/memory.cpp
+++ b/src/modules/memory.cpp
@@ -5,7 +5,7 @@
 
 using namespace modules;
 
-MemoryModule::MemoryModule(const std::string& name_) : TimerModule(name_, 1s)
+MemoryModule::MemoryModule(std::string name_) : TimerModule(name_, 1s)
 {
   this->interval = std::chrono::duration<double>(
     config::get<float>(name(), "interval", 1));
@@ -63,7 +63,7 @@ bool MemoryModule::update()
   this->label_tokenized->replace_token("%percentage_used%", std::to_string(this->percentage_used)+"%");
   this->label_tokenized->replace_token("%percentage_free%", std::to_string(this->percentage_free)+"%");
 
-  auto replace_unit = [](drawtypes::Label *label, const std::string& token, float value, const std::string& unit){
+  auto replace_unit = [](drawtypes::Label *label, std::string token, float value, std::string unit){
     if (label->text.find(token) != std::string::npos) {
       std::stringstream ss;
       ss.precision(2);
@@ -83,7 +83,7 @@ bool MemoryModule::update()
   return true;
 }
 
-bool MemoryModule::build(Builder *builder, const std::string& tag)
+bool MemoryModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_BAR_USED)
     builder->node(this->bar_used, this->percentage_used);
diff --git a/src/modules/menu.cpp b/src/modules/menu.cpp
index 7f8ab420..00433440 100644
--- a/src/modules/menu.cpp
+++ b/src/modules/menu.cpp
@@ -5,7 +5,7 @@
 
 using namespace modules;
 
-MenuModule::MenuModule(const std::string& name_) : StaticModule(name_)
+MenuModule::MenuModule(std::string name_) : StaticModule(name_)
 {
   auto default_format_string = std::string(TAG_LABEL_TOGGLE) +" "+ std::string(TAG_MENU);
 
@@ -59,7 +59,7 @@ std::string MenuModule::get_output()
   return this->builder->flush();
 }
 
-bool MenuModule::build(Builder *builder, const std::string& tag)
+bool MenuModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_LABEL_TOGGLE && this->current_level == -1) {
     builder->cmd(Cmd::LEFT_CLICK, std::string(EVENT_MENU_OPEN) +"0");
@@ -94,7 +94,7 @@ bool MenuModule::build(Builder *builder, const std::string& tag)
   return true;
 }
 
-bool MenuModule::handle_command(const std::string& cmd)
+bool MenuModule::handle_command(std::string cmd)
 {
   std::lock_guard<std::mutex> lck(this->cmd_mtx);
 
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index c30e6d6e..a3960787 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -10,7 +10,7 @@
 using namespace modules;
 using namespace mpd;
 
-MpdModule::MpdModule(const std::string& name_)
+MpdModule::MpdModule(std::string name_)
   : EventModule(name_), icons(std::make_unique<drawtypes::IconMap>())
 {
   // Load configuration values {{{
@@ -205,7 +205,7 @@ std::string MpdModule::get_format() {
   return this->mpd->connected() ? FORMAT_ONLINE : FORMAT_OFFLINE;
 }
 
-bool MpdModule::build(Builder *builder, const std::string& tag)
+bool MpdModule::build(Builder *builder, std::string tag)
 {
   auto icon_cmd = [](Builder *builder, std::string cmd, std::unique_ptr<drawtypes::Icon> &icon){
     builder->cmd(Cmd::LEFT_CLICK, cmd);
@@ -256,7 +256,7 @@ bool MpdModule::build(Builder *builder, const std::string& tag)
   return true;
 }
 
-bool MpdModule::handle_command(const std::string& cmd)
+bool MpdModule::handle_command(std::string cmd)
 {
   if (cmd.length() < 3 || cmd.substr(0, 3) != "mpd")
     return false;
diff --git a/src/modules/network.cpp b/src/modules/network.cpp
index 716cc602..706110f4 100644
--- a/src/modules/network.cpp
+++ b/src/modules/network.cpp
@@ -11,7 +11,7 @@ using namespace modules;
 
 // TODO: Add up-/download speed (check how ifconfig read the bytes)
 
-NetworkModule::NetworkModule(const std::string& name_)
+NetworkModule::NetworkModule(std::string name_)
   : TimerModule(name_, 1s), connected(false), conseq_packetloss(false)
 {
   static const auto DEFAULT_FORMAT_CONNECTED = TAG_LABEL_CONNECTED;
@@ -179,7 +179,7 @@ std::string NetworkModule::get_format()
     return FORMAT_CONNECTED;
 }
 
-bool NetworkModule::build(Builder *builder, const std::string& tag)
+bool NetworkModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_LABEL_CONNECTED)
     builder->node(this->label_connected_tokenized);
diff --git a/src/modules/script.cpp b/src/modules/script.cpp
index 2cb54fd0..7616d15e 100644
--- a/src/modules/script.cpp
+++ b/src/modules/script.cpp
@@ -6,7 +6,7 @@
 
 using namespace modules;
 
-ScriptModule::ScriptModule(const std::string& name_)
+ScriptModule::ScriptModule(std::string name_)
   : TimerModule(name_, 1s), builder(std::make_unique<Builder>(true)), counter(0)
 {
   // Load configuration values {{{
@@ -116,7 +116,7 @@ std::string ScriptModule::get_output()
   return this->builder->flush();
 }
 
-bool ScriptModule::build(Builder *builder, const std::string& tag)
+bool ScriptModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_OUTPUT)
     builder->node(string::replace_all(this->output, "\n", ""));
diff --git a/src/modules/text.cpp b/src/modules/text.cpp
index e6accf6a..cb1e3ebd 100644
--- a/src/modules/text.cpp
+++ b/src/modules/text.cpp
@@ -5,7 +5,7 @@
 
 using namespace modules;
 
-TextModule::TextModule(const std::string& name_) : StaticModule(name_) {
+TextModule::TextModule(std::string name_) : StaticModule(name_) {
   this->formatter->add(FORMAT, "", {});
   if (this->formatter->get(FORMAT)->value.empty())
     throw UndefinedFormat(FORMAT);
diff --git a/src/modules/volume.cpp b/src/modules/volume.cpp
index 229922f1..f265df1a 100644
--- a/src/modules/volume.cpp
+++ b/src/modules/volume.cpp
@@ -6,7 +6,7 @@
 
 using namespace modules;
 
-VolumeModule::VolumeModule(const std::string& name_) : EventModule(name_)
+VolumeModule::VolumeModule(std::string name_) : EventModule(name_)
 {
   // Load configuration values {{{
   auto master_mixer = config::get<std::string>(name(), "master_mixer", "Master");
@@ -182,7 +182,7 @@ std::string VolumeModule::get_output()
   return this->builder->flush();
 }
 
-bool VolumeModule::build(Builder *builder, const std::string& tag)
+bool VolumeModule::build(Builder *builder, std::string tag)
 {
   if (tag == TAG_BAR_VOLUME)
     builder->node(this->bar_volume, volume);
@@ -198,7 +198,7 @@ bool VolumeModule::build(Builder *builder, const std::string& tag)
   return true;
 }
 
-bool VolumeModule::handle_command(const std::string& cmd)
+bool VolumeModule::handle_command(std::string cmd)
 {
   if (cmd.length() < std::strlen(EVENT_PREFIX))
     return false;
diff --git a/src/registry.cpp b/src/registry.cpp
index 764d6924..3d072a49 100644
--- a/src/registry.cpp
+++ b/src/registry.cpp
@@ -111,7 +111,7 @@ bool Registry::wait()
   return true;
 }
 
-void Registry::notify(const std::string& module_name)
+void Registry::notify(std::string module_name)
 {
   log_trace(module_name +" - STAGE "+ std::to_string(this->stage()));
 
@@ -145,12 +145,12 @@ void Registry::notify(const std::string& module_name)
   this->wait_cv.notify_one();
 }
 
-std::string Registry::get(const std::string& module_name)
+std::string Registry::get(std::string module_name)
 {
   return (*this->find(module_name)->module)();
 }
 
-std::unique_ptr<RegistryModuleEntry>& Registry::find(const std::string& module_name)
+std::unique_ptr<RegistryModuleEntry>& Registry::find(std::string module_name)
 {
   for (auto &&entry : this->modules)
     if (entry->module->name() == module_name)
diff --git a/src/services/builder.cpp b/src/services/builder.cpp
index d91a51ae..b8920193 100644
--- a/src/services/builder.cpp
+++ b/src/services/builder.cpp
@@ -12,7 +12,7 @@
 
 // Private
 
-void Builder::tag_open(char tag, const std::string& value) {
+void Builder::tag_open(char tag, std::string value) {
   this->append("%{"+ std::string({tag}) + value +"}");
 }
 
@@ -67,7 +67,7 @@ std::string Builder::flush()
   return string::replace_all(output, std::string(BUILDER_SPACE_TOKEN), " ");
 }
 
-void Builder::append(const std::string& text)
+void Builder::append(std::string text)
 {
   std::string str(text);
   auto len = str.length();
@@ -77,7 +77,7 @@ void Builder::append(const std::string& text)
     this->output += str;
 }
 
-void Builder::append_module_output(Alignment alignment, const std::string& module_output, bool margin_left, bool margin_right)
+void Builder::append_module_output(Alignment alignment, std::string module_output, bool margin_left, bool margin_right)
 {
   if (module_output.empty()) return;
 
@@ -102,7 +102,7 @@ void Builder::append_module_output(Alignment alignment, const std::string& modul
     this->output += std::string(margin, ' ');
 }
 
-void Builder::node(const std::string& str, bool add_space)
+void Builder::node(std::string str, bool add_space)
 {
   std::string::size_type n, m;
   std::string s(str);
@@ -182,7 +182,7 @@ void Builder::node(const std::string& str, bool add_space)
   if (add_space) this->space();
 }
 
-void Builder::node(const std::string& str, int font_index, bool add_space)
+void Builder::node(std::string str, int font_index, bool add_space)
 {
   this->font(font_index);
     this->node(str, add_space);
@@ -317,7 +317,7 @@ void Builder::font_close(bool force)
 
 // Back- and foreground
 
-void Builder::background(const std::string& color_)
+void Builder::background(std::string color_)
 {
   auto color(color_);
 
@@ -347,7 +347,7 @@ void Builder::background_close(bool force)
   this->tag_close('B');
 }
 
-void Builder::color(const std::string& color_)
+void Builder::color(std::string color_)
 {
   auto color(color_);
   if (color.length() == 2 || (color.find("#") == 0 && color.length() == 3)) {
@@ -367,7 +367,7 @@ void Builder::color(const std::string& color_)
   this->tag_open('F', color);
 }
 
-void Builder::color_alpha(const std::string& alpha_)
+void Builder::color_alpha(std::string alpha_)
 {
   auto alpha(alpha_);
   std::string val = bar_opts().foreground;
@@ -394,7 +394,7 @@ void Builder::color_close(bool force)
 
 // Under- and overline
 
-void Builder::line_color(const std::string& color)
+void Builder::line_color(std::string color)
 {
   if (color.empty() && this->U > 0) this->line_color_close(true);
   if (color.empty() || color == this->U_value) return;
@@ -414,7 +414,7 @@ void Builder::line_color_close(bool force)
   this->tag_close('U');
 }
 
-void Builder::overline(const std::string& color)
+void Builder::overline(std::string color)
 {
   if (!color.empty()) this->line_color(color);
   if (this->o > 0) return;
@@ -431,7 +431,7 @@ void Builder::overline_close(bool force)
   this->append("%{-o}");
 }
 
-void Builder::underline(const std::string& color)
+void Builder::underline(std::string color)
 {
   if (!color.empty()) this->line_color(color);
   if (this->u > 0) return;
diff --git a/src/services/command.cpp b/src/services/command.cpp
index eab2f6d8..7b3362e1 100644
--- a/src/services/command.cpp
+++ b/src/services/command.cpp
@@ -27,7 +27,7 @@
  * std::cout << cmd->readline(); //---> 1
  * std::cout << cmd->readline() << cmd->readline(); //---> 23
  */
-Command::Command(const std::string& cmd, int stdout[2], int stdin[2])
+Command::Command(std::string cmd, int stdout[2], int stdin[2])
   : cmd(cmd)
 {
   if (stdin != nullptr) {
@@ -135,7 +135,7 @@ void Command::tail(std::function<void(std::string)> callback) {
   io::tail(this->fd_stdout[PIPE_READ], callback);
 }
 
-int Command::writeline(const std::string& data) {
+int Command::writeline(std::string data) {
   return io::writeline(this->fd_stdin[PIPE_WRITE], data);
 }
 
diff --git a/src/services/inotify.cpp b/src/services/inotify.cpp
index 92aadf6b..bb351975 100644
--- a/src/services/inotify.cpp
+++ b/src/services/inotify.cpp
@@ -8,7 +8,7 @@
 #include "utils/macros.hpp"
 #include "utils/proc.hpp"
 
-InotifyWatch::InotifyWatch(const std::string& path, int mask)
+InotifyWatch::InotifyWatch(std::string path, int mask)
 {
   log_trace("Installing watch at: "+ path);
 
diff --git a/src/services/store.cpp b/src/services/store.cpp
index 8bc70016..d358ddfd 100644
--- a/src/services/store.cpp
+++ b/src/services/store.cpp
@@ -58,7 +58,7 @@ std::string &Store::get_string(std::string& s)
   return s;
 }
 
-void Store::set_string(const std::string& s)
+void Store::set_string(std::string s)
 {
   log_trace("Storing: \""+ s +"\"");
   std::memcpy(this->region.get_address(), s.c_str(), this->region.get_size());
diff --git a/src/utils/cli.cpp b/src/utils/cli.cpp
index 324debf2..d9467b8c 100644
--- a/src/utils/cli.cpp
+++ b/src/utils/cli.cpp
@@ -12,23 +12,23 @@ namespace cli
   std::vector<Option> options;
   std::map<std::string, std::string> values;
 
-  void add_option(const std::string& opt_short, const std::string& opt_long, const std::string& help) {
+  void add_option(std::string opt_short, std::string opt_long, std::string help) {
     add_option(opt_short, opt_long, "", help);
   }
 
-  void add_option(const std::string& opt_short, const std::string& opt_long, const std::string& placeholder, const std::string& help, std::vector<std::string> accept) {
+  void add_option(std::string opt_short, std::string opt_long, std::string placeholder, std::string help, std::vector<std::string> accept) {
     options.emplace_back(Option(opt_short, opt_long, placeholder, accept, help));
   }
 
-  bool is_option(char *opt, const std::string& opt_short, const std::string& opt_long) {
+  bool is_option(char *opt, std::string opt_short, std::string opt_long) {
     return is_option_short(opt, opt_short) || is_option_long(opt, opt_long);
   }
 
-  bool is_option_short(char *opt, const std::string& opt_short) {
+  bool is_option_short(char *opt, std::string opt_short) {
     return std::strncmp(opt, opt_short.c_str(), opt_short.length()) ==  0;
   }
 
-  bool is_option_long(char *opt, const std::string& opt_long) {
+  bool is_option_long(char *opt, std::string opt_long) {
     return std::strncmp(opt, opt_long.c_str(), opt_long.length()) == 0;
   }
 
@@ -52,18 +52,18 @@ namespace cli
     return value;
   }
 
-  bool has_option(const std::string& opt) {
+  bool has_option(std::string opt) {
     return values.find(opt) != values.end();
   }
 
-  std::string get_option_value(const std::string& opt)
+  std::string get_option_value(std::string opt)
   {
     if (has_option(opt))
       return values.find(opt)->second;
     else return "";
   }
 
-  bool match_option_value(const std::string& opt, const std::string& val) {
+  bool match_option_value(std::string opt, std::string val) {
     return get_option_value(opt) == val;
   }
 
@@ -86,7 +86,7 @@ namespace cli
     }
   }
 
-  void usage(const std::string& usage, bool exit_success)
+  void usage(std::string usage, bool exit_success)
   {
     int longest_n = 0;
 
diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index 4446566a..66144e64 100644
--- a/src/utils/config.cpp
+++ b/src/utils/config.cpp
@@ -8,7 +8,7 @@ namespace config
   std::string file_path;
   std::string bar_path;
 
-  void set_bar_path(const std::string &path)
+  void set_bar_path(std::string path)
   {
     bar_path = path;
   }
@@ -18,7 +18,7 @@ namespace config
     return bar_path;
   }
 
-  void load(const std::string& path)
+  void load(std::string path)
   {
     if (!io::file::exists(path)) {
       throw UnexistingFileError("Could not find configuration file \""+ path + "\"");
@@ -35,7 +35,7 @@ namespace config
     file_path = path;
   }
 
-  void load(const char *dir, const std::string& path) {
+  void load(const char *dir, std::string path) {
     load(std::string(dir != nullptr ? dir : "") +"/"+ path);
   }
 
@@ -52,7 +52,7 @@ namespace config
     return pt;
   }
 
-  std::string build_path(const std::string& section, const std::string& key) {
+  std::string build_path(std::string section, std::string key) {
     return section +"."+ key;
   }
 
diff --git a/src/utils/io.cpp b/src/utils/io.cpp
index 3e6505f7..ddaba48e 100644
--- a/src/utils/io.cpp
+++ b/src/utils/io.cpp
@@ -18,7 +18,7 @@ namespace io
 {
   namespace socket
   {
-    int open(const std::string& path)
+    int open(std::string path)
     {
       int fd;
       struct sockaddr_un sock_addr;
@@ -39,7 +39,7 @@ namespace io
       return fd;
     }
 
-    int send(int fd, const std::string& data, int flags)
+    int send(int fd, std::string data, int flags)
     {
       int bytes = ::send(fd, data.c_str(), data.size()+1, flags);
       if (bytes == -1)
@@ -60,13 +60,13 @@ namespace io
 
   namespace file
   {
-    bool exists(const std::string& fname)
+    bool exists(std::string fname)
     {
       struct stat buffer;
       return (stat(fname.c_str(), &buffer) == 0);
     }
 
-    std::string get_contents(const std::string& fname)
+    std::string get_contents(std::string fname)
     {
       try {
         std::ifstream ifs(fname);
@@ -80,7 +80,7 @@ namespace io
       }
     }
 
-    bool is_fifo(const std::string& fname)
+    bool is_fifo(std::string fname)
     {
       FILE *fp = fopen(fname.c_str(), "r");
       int fd = fileno(fp);
@@ -91,12 +91,12 @@ namespace io
       return is_fifo;
     }
 
-    std::size_t write(io::file::FilePtr *fptr, const std::string& data) {
+    std::size_t write(io::file::FilePtr *fptr, std::string data) {
       auto buf = data.c_str();
       return fwrite(buf, sizeof(char), sizeof(buf), (*fptr)());
     }
 
-    std::size_t write(const std::string& fpath, const std::string& data) {
+    std::size_t write(std::string fpath, std::string data) {
       return io::file::write(std::make_unique<FilePtr>(fpath, "a+").get(), data);
     }
   }
@@ -157,11 +157,11 @@ namespace io
     return readline(read_fd, bytes_read);
   }
 
-  int write(int write_fd, const std::string& data) {
+  int write(int write_fd, std::string data) {
     return ::write(write_fd, data.c_str(), strlen(data.c_str()));
   }
 
-  int writeline(int write_fd, const std::string& data)
+  int writeline(int write_fd, std::string data)
   {
     if (data.length() == 0) return -1;
     if (data.substr(data.length()-1, 1) != "\n")
diff --git a/src/utils/proc.cpp b/src/utils/proc.cpp
index 11f3d659..90f0bb32 100644
--- a/src/utils/proc.cpp
+++ b/src/utils/proc.cpp
@@ -51,7 +51,7 @@ namespace proc
     return true;
   }
 
-  void exec(const std::string& cmd)
+  void exec(std::string cmd)
   {
     // log_trace(string::replace_all(cmd, "\n", " "));
 
diff --git a/src/utils/string.cpp b/src/utils/string.cpp
index 3f0e35bf..fce66eb9 100644
--- a/src/utils/string.cpp
+++ b/src/utils/string.cpp
@@ -4,11 +4,11 @@
 
 namespace string
 {
-  bool compare(const std::string& s1, const std::string& s2) {
+  bool compare(std::string s1, std::string s2) {
     return lower(s1) == lower(s2);
   }
 
-  // std::string upper(const std::string& s)
+  // std::string upper(std::string s)
   // {
   //   std::string str(s);
   //   for (auto &c : str)
@@ -16,7 +16,7 @@ namespace string
   //   return str;
   // }
 
-  std::string lower(const std::string& s)
+  std::string lower(std::string s)
   {
     std::string str(s);
     for (auto &c : str)
@@ -24,7 +24,7 @@ namespace string
     return str;
   }
 
-  std::string replace(const std::string& haystack, const std::string& needle, const std::string& replacement)
+  std::string replace(std::string haystack, std::string needle, std::string replacement)
   {
     std::string str(haystack);
     std::string::size_type pos;
@@ -33,15 +33,15 @@ namespace string
     return str;
   }
 
-  std::string replace_all(const std::string& haystack, const std::string& needle, const std::string& replacement) {
+  std::string replace_all(std::string haystack, std::string needle, std::string replacement) {
     return boost::replace_all_copy(haystack, needle, replacement);
   }
 
-  std::string squeeze(const std::string& haystack, const char &needle) {
+  std::string squeeze(std::string haystack, const char &needle) {
     return replace_all(haystack, {needle, needle}, {needle});
   }
 
-  // std::string strip(const std::string& haystack, const char &needle)
+  // std::string strip(std::string haystack, const char &needle)
   // {
   //   std::string str(haystack);
   //   std::string::size_type pos;
@@ -50,7 +50,7 @@ namespace string
   //   return str;
   // }
 
-  std::string strip_trailing_newline(const std::string& haystack)
+  std::string strip_trailing_newline(std::string haystack)
   {
     std::string str(haystack);
     if (str[str.length()-1] == '\n')
@@ -58,11 +58,11 @@ namespace string
     return str;
   }
 
-  std::string trim(const std::string& haystack, const char &needle) {
+  std::string trim(std::string haystack, const char &needle) {
     return rtrim(ltrim(haystack, needle), needle);
   }
 
-  std::string ltrim(const std::string& haystack, const char &needle)
+  std::string ltrim(std::string haystack, const char &needle)
   {
     std::string str(haystack);
     while (str[0] == needle)
@@ -70,7 +70,7 @@ namespace string
     return str;
   }
 
-  std::string rtrim(const std::string& haystack, const char &needle)
+  std::string rtrim(std::string haystack, const char &needle)
   {
     std::string str(haystack);
     while (str[str.length()-1] == needle)
@@ -78,7 +78,7 @@ namespace string
     return str;
   }
 
-  std::string join(const std::vector<std::string> &strs, const std::string& delim)
+  std::string join(const std::vector<std::string> &strs, std::string delim)
   {
     std::string str;
     for (auto &s : strs)
@@ -86,13 +86,13 @@ namespace string
     return str;
   }
 
-  std::vector<std::string> split(const std::string& s, const char &delim)
+  std::vector<std::string> split(std::string s, const char &delim)
   {
     std::vector<std::string> vec;
     return split_into(s, delim, vec);
   }
 
-  std::vector<std::string> &split_into(const std::string& s, const char &delim, std::vector<std::string> &container)
+  std::vector<std::string> &split_into(std::string s, const char &delim, std::vector<std::string> &container)
   {
     std::string str;
     std::stringstream buffer(s);
@@ -101,7 +101,7 @@ namespace string
     return container;
   }
 
-  std::size_t find_nth(const std::string& haystack, std::size_t pos, const std::string& needle, std::size_t nth)
+  std::size_t find_nth(std::string haystack, std::size_t pos, std::string needle, std::size_t nth)
   {
     std::size_t found_pos = haystack.find(needle, pos);
     if(0 == nth || std::string::npos == found_pos)  return found_pos;
diff --git a/src/utils/xlib.cpp b/src/utils/xlib.cpp
index 5438015c..d349f55a 100644
--- a/src/utils/xlib.cpp
+++ b/src/utils/xlib.cpp
@@ -59,7 +59,7 @@ namespace xlib
     return monitors;
   }
 
-  // std::unique_ptr<Monitor> get_monitor(const std::string& n_monitorsame)
+  // std::unique_ptr<Monitor> get_monitor(std::string n_monitorsame)
   // {
   //   auto monitor = std::make_unique<Monitor>();
   //   int n_monitors;