diff --git a/Info.hpp b/Info.hpp
index a6da8c8..62c7bfc 100644
--- a/Info.hpp
+++ b/Info.hpp
@@ -1,279 +1,65 @@
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <string>
-#include <iostream>
-
-#ifdef __linux__
+#ifdef __linux
+	#define COLUMBUS_PLATFORM_LINUX
 	#include <sys/sysinfo.h>
 	#include <unistd.h>
 #endif
 
-#ifdef _WIN32
-	#define COLUMBUS_PLATFORM_WINDOWS
-#endif
-
-#ifdef _WIN64
-	#define COLUMBUS_PLATFORM_WINDOWS
-#endif
-
-#ifdef COLUMBUS_PLATFORM_WINDOWS
-	#include <windows.h>
-	#include <psapi.h>
-#endif
+#include <cstdlib>
 
 namespace Columbus
 {
 
-	int GetCPUCount();
-	int GetCPUCacheSize();
-	int GetCPUUsage();
-	float GetCPUTemperature();
-	unsigned long GetRAMSize();
-	unsigned long GetRAMFree();
-	unsigned long GetRAMThis();
-	int GetRAMUsage();
-	int GetGPUUsage();
-	float GetGPUTemperature();
-	unsigned long GetGPUMemorySize();
-	unsigned long GetGPUMemoryFree();
-	int GetGPUMemoryUsage();
-
-	int GetCPUCount()
+	class Info
 	{
-		#ifdef __linux__
+	public:
+		static unsigned int getCPUCount();
+
+		static unsigned long getRAMSize();
+		static unsigned long getRAMFree();
+		static int getRAMUsage();
+	};
+
+	unsigned int Info::getCPUCount()
+	{
+		#ifdef COLUMBUS_PLATFORM_LINUX
 			return sysconf(_SC_NPROCESSORS_ONLN);
 		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			SYSTEM_INFO sysinfo;
-			GetSystemInfo(&sysinfo);
-			return sysinfo.dwNumberOfProcessors;
-		#endif
-
-		return 0;
 	}
 
-	int GetCPUCacheSize()
+	unsigned long Info::getRAMSize()
 	{
-		#ifdef __linux__
-			return sysconf(_SC_PAGESIZE);
-		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			SYSTEM_INFO sysinfo;
-			GetSystemInfo(&sysinfo);
-			return sysinfo.dwPageSize;
-		#endif	
-
-		return 0;
-	}
-
-	int GetCPUUsage()
-	{
-		#ifdef __linux__
-			double load[3];
-			getloadavg(load, 3);
-			return static_cast<int>(load[0] * 100);
-		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-
-		#endif
-
-		return 0;
-	}
-
-	float GetCPUTemperature()
-	{
-		#ifdef __linux__
-			int hwmon = 0;
-			std::ifstream name1("/sys/class/hwmon/hwmon0/name");
-			std::ifstream name2("/sys/class/hwmon/hwmon1/name");
-			if (name1.is_open() == false || name2.is_open() == false) return 0;
-			std::string tmp;
-
-			name1 >> tmp;
-			if (tmp.find("coretemp") != std::string::npos) hwmon = 0;
-			name2 >> tmp;
-			if (tmp.find("coretemp") != std::string::npos) hwmon = 1;
-
-			name1.close();
-			name2.close();
-
-			float t = 0.0;
-			std::string hw;
-			if (hwmon == 0) hw = "0";
-			if (hwmon == 1) hw = "1";
-
-			std::ifstream tmp1(("/sys/class/hwmon/hwmon" + hw + "/temp1_input").c_str());
-			std::ifstream tmp2(("/sys/class/hwmon/hwmon" + hw + "/temp2_input").c_str());
-			std::ifstream tmp3(("/sys/class/hwmon/hwmon" + hw + "/temp3_input").c_str());
-			if (tmp1.is_open() != false)
-			{
-				tmp1 >> t;
-				return (t / 1000);
-			}
-
-			if (tmp2.is_open() != false)
-			{
-				tmp2 >> t;
-				return (t / 1000);
-			}
-
-			if (tmp3.is_open() != false)
-			{
-				tmp1 >> t;
-				return (t / 1000);
-			}
-			return 0.0;
-
-		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			BSTR strClassProp = SysAllocString(L"CurrentTemperature");
-			std::cout << strClassProp << std::endl;
-		#endif
-
-		return 0;
-	}
-
-	unsigned long GetRAMSize()
-	{
-		#ifdef __linux__
+		#ifdef COLUMBUS_PLATFORM_LINUX
 			struct sysinfo info;
 			if (sysinfo(&info) == -1) return 0;
 			return info.totalram / (1024 * 1024);
 		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			MEMORYSTATUSEX memInfo;
-			memInfo.dwLength = sizeof(memInfo);
-			GlobalMemoryStatusEx(&memInfo);
-			return memInfo.ullTotalPhys / (1024 * 1024);
-		#endif	
-
-		return 0;
 	}
 
-	unsigned long GetRAMFree()
+	unsigned long Info::getRAMFree()
 	{
-		#ifdef __linux__
+		#ifdef COLUMBUS_PLATFORM_LINUX
 			struct sysinfo info;
 			if (sysinfo(&info) == -1) return 0;
 			return info.freeram / (1024 * 1024);
 		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			MEMORYSTATUSEX memInfo;
-			memInfo.dwLength = sizeof(memInfo);
-			GlobalMemoryStatusEx(&memInfo);
-			return memInfo.ullAvailPhys / (1024 * 1024);
-		#endif	
-
-		return 0;
 	}
 
-	unsigned long GetRAMThis()
+	int Info::getRAMUsage()
 	{
-		#ifdef __linux__
-		   	FILE* fp = fopen("/proc/self/status", "r");
-		   	char line[512];
-
-		   	while (fgets(line, 512, fp) != NULL)
-		   	{
-				if (strncmp(line, "VmRSS:", 6) == 0)
-				{
-					fclose(fp);
-					std::string l = line;
-					l = l.substr(6, l.size() - 4);
-					return atoi(l.c_str()) / 1024;
-				}
-			}
-
-
-		   	fclose(fp);
-		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			PROCESS_MEMORY_COUNTERS meminfo;
-			GetProcessMemoryInfo(GetCurrentProcess(), &meminfo, sizeof(meminfo));
-			return meminfo.WorkingSetSize / (1024 * 1024);
-		#endif
-
-		return 0;
-	}
-
-	int GetRAMUsage()
-	{
-		#ifdef __linux__
+		#ifdef COLUMBUS_PLATFORM_LINUX
 			struct sysinfo info;
 			if (sysinfo(&info) == -1) return 0;
-			float usage = static_cast<float>(GetRAMFree()) / static_cast<float>(GetRAMSize());
+			float usage = static_cast<float>(getRAMFree()) / static_cast<float>(getRAMSize());
 			return static_cast<int>(100 - usage * 100);
 		#endif
-
-		#ifdef COLUMBUS_PLATFORM_WINDOWS
-			MEMORYSTATUSEX memInfo;
-			memInfo.dwLength = sizeof(memInfo);
-			GlobalMemoryStatusEx(&memInfo);
-			return memInfo.dwMemoryLoad;
-		#endif
-
-		return 0;
-	}
-
-	float GetGPUTemperature()
-	{
-		#ifdef __linux__
-			int hwmon = 0;
-			std::ifstream name1("/sys/class/hwmon/hwmon0/name");
-			std::ifstream name2("/sys/class/hwmon/hwmon1/name");
-			if (name1.is_open() == false || name2.is_open() == false) return 0;
-			std::string tmp;
-
-			name1 >> tmp;
-			if (tmp.find("coretemp") == std::string::npos) hwmon = 0;
-			name2 >> tmp;
-			if (tmp.find("coretemp") == std::string::npos) hwmon = 1;
-
-			name1.close();
-			name2.close();
-
-			float t = 0.0;
-			std::string hw;
-			if (hwmon == 0) hw = "0";
-			if (hwmon == 1) hw = "1";
-
-			std::ifstream tmp1(("/sys/class/hwmon/hwmon" + hw + "/temp1_input").c_str());
-			std::ifstream tmp2(("/sys/class/hwmon/hwmon" + hw + "/temp2_input").c_str());
-			std::ifstream tmp3(("/sys/class/hwmon/hwmon" + hw + "/temp3_input").c_str());
-			if (tmp1.is_open() != false)
-			{
-				tmp1 >> t;
-				return (t / 1000);
-			}
-
-			if (tmp2.is_open() != false)
-			{
-				tmp2 >> t;
-				return (t / 1000);
-			}
-
-			if (tmp3.is_open() != false)
-			{
-				tmp1 >> t;
-				return (t / 1000);
-			}
-			return 0.0;
-
-		#endif
-
-		return 0;
 	}
 
 }
 
 
+#undef COLUMBUS_PLATFORM_LINUX
+
+
+