1 files changed, 4 insertions, 13 deletions
diff --git a/src/include/tools.h b/src/include/tools.h
index f70486f..1d86fca 100644
--- a/src/include/tools.h
+++ b/src/include/tools.h
@@ -5,19 +5,10 @@
  *  @date 2002-2005
  */
 
+#include <optional>
 #include <string>
 
-namespace Binc {
-
-  class Tools {
-  private:
-    Tools();
-
-  public:
-    void setenv(const std::string &key, const std::string &value) const;
-    std::string getenv(const std::string &key) const;
-
-    static Tools &getInstance();
-  };
-
+namespace Binc::Tools {
+  void setenv(const std::string &key, const std::string &value);
+  std::optional<std::string> getenv(const std::string &key);
 }