diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp
index 587c6ddd..c1fc197b 100644
--- a/src/coders/toml.cpp
+++ b/src/coders/toml.cpp
@@ -61,7 +61,7 @@ class Reader : public BasicParser {
                 } else if (identifier == "inf") {
                     handler.setValue(name, *dynamic::Value::of(INFINITY));
                 } else if (identifier == "nan") {
-                handler.setValue(name, *dynamic::Value::of(NAN));
+                    handler.setValue(name, *dynamic::Value::of(NAN));
                 }
             } else if (c == '"' || c == '\'') {
                 pos++;
diff --git a/src/data/setting.cpp b/src/data/setting.cpp
index c1de4b6c..6365da0f 100644
--- a/src/data/setting.cpp
+++ b/src/data/setting.cpp
@@ -1,4 +1,4 @@
-#include "setting.h"
+#include "setting.hpp"
 
 #include "../util/stringutil.h"
 
diff --git a/src/data/setting.h b/src/data/setting.hpp
similarity index 100%
rename from src/data/setting.h
rename to src/data/setting.hpp
diff --git a/src/settings.h b/src/settings.h
index c1ae858e..cad7934e 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "data/setting.h"
+#include "data/setting.hpp"
 #include "constants.h"
 #include "typedefs.h"
 
diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp
index 8392a0c1..c9751d9b 100644
--- a/src/util/command_line.cpp
+++ b/src/util/command_line.cpp
@@ -1,4 +1,4 @@
-#include "command_line.h"
+#include "command_line.hpp"
 
 #include <filesystem>
 
diff --git a/src/util/command_line.h b/src/util/command_line.hpp
similarity index 75%
rename from src/util/command_line.h
rename to src/util/command_line.hpp
index 11441b6d..f0d8bfbb 100644
--- a/src/util/command_line.h
+++ b/src/util/command_line.hpp
@@ -1,5 +1,5 @@
-#ifndef UTIL_COMMAND_LINE_H_
-#define UTIL_COMMAND_LINE_H_
+#ifndef UTIL_COMMAND_LINE_HPP_
+#define UTIL_COMMAND_LINE_HPP_
 
 #include <string>
 #include <iostream>
@@ -35,7 +35,7 @@ public:
     }
 };
 
-/* @return false if engine start can*/
-extern bool parse_cmdline(int argc, char** argv, EnginePaths& paths);
+/// @return false if engine start can
+bool parse_cmdline(int argc, char** argv, EnginePaths& paths);
 
-#endif // UTIL_COMMAND_LINE_H_
+#endif // UTIL_COMMAND_LINE_HPP_
diff --git a/src/util/stringutil.cpp b/src/util/stringutil.cpp
index 928e624f..44543d4f 100644
--- a/src/util/stringutil.cpp
+++ b/src/util/stringutil.cpp
@@ -197,6 +197,7 @@ void util::trim(std::string &s) {
 
 std::string util::to_string(double x) {
     std::stringstream ss;
+    ss << std::setprecision(6);
     ss << x;
     return ss.str(); 
 }
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index a5d82d45..726b2b86 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -12,11 +12,11 @@
 #include "files/settings_io.hpp"
 #include "files/engine_paths.h"
 #include "util/platform.h"
-#include "util/command_line.h"
+#include "util/command_line.hpp"
 #include "debug/Logger.hpp"
 
-#define SETTINGS_FILE "settings.toml"
-#define CONTROLS_FILE "controls.json"
+inline std::string SETTINGS_FILE = "settings.toml";
+inline std::string CONTROLS_FILE = "controls.json";
 
 static debug::Logger logger("main");