diff --git a/FileUtils.h b/FileUtils.h
index 226e790c..e5e60cb6 100644
--- a/FileUtils.h
+++ b/FileUtils.h
@@ -160,46 +160,6 @@ public:
 		return FillByWildcard(sDir, "*");
 	}
 
-/*	static bool Create(const CString& sDir, mode_t mode = 0755) {
-		VCCString vSubDirs = sDir.split("[/\\\\]+");
-		CCString sCurDir;
-
-		for (unsigned int a = 0; a < vSubDirs.size(); a++) {
-			sCurDir += vSubDirs[a] + "/";
-			if ((!CDir::Exists(sCurDir)) && (mkdir(sCurDir.c_str(), mode) != 0)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	int FillByRegex(const CCString& sDir, const CCString& sRegex, const CCString& sFlags = "") {
-		CleanUp();
-		DIR* dir = opendir((sDir.empty()) ? "." : sDir.c_str());
-
-		if (!dir) {
-			return 0;
-		}
-
-		struct dirent * de;
-
-		while ((de = readdir(dir)) != 0) {
-			if ((strcmp(de->d_name, ".") == 0) || (strcmp(de->d_name, "..") == 0)) {
-				continue;
-			}
-			if ((!sRegex.empty()) && (!CCString::search(de->d_name, sRegex, sFlags))) {
-				continue;
-			}
-
-			CFile *file = new CFile(sDir, de->d_name, this);
-			push_back(file);
-		}
-
-		closedir(dir);
-		return size();
-	}*/
-
 	int FillByWildcard(const CString& sDir, const CString& sWildcard) {
 		CleanUp();
 		DIR* dir = opendir((sDir.empty()) ? "." : sDir.c_str());
diff --git a/ZNCString.h b/ZNCString.h
index 83c1e73d..3ced8428 100644
--- a/ZNCString.h
+++ b/ZNCString.h
@@ -30,14 +30,14 @@ using std::pair;
 class CString;
 class MCString;
 
-typedef set<CString>					SCString;
-typedef set<CString>					SPair;
+typedef set<CString> SCString;
+typedef set<CString> SPair;
 
-typedef vector<CString>					VCString;
-typedef vector<pair<CString, CString> >	VPair;
+typedef vector<CString>                 VCString;
+typedef vector<pair<CString, CString> > VPair;
 
-typedef list<CString>					LCString;
-typedef list<pair<CString, CString> >	LPair;
+typedef list<CString>                   LCString;
+typedef list<pair<CString, CString> >   LPair;
 
 static const unsigned char XX = 0xff;
 static const unsigned char base64_table[256] = {
diff --git a/defines.h b/defines.h
index fc00bbf1..99f12893 100644
--- a/defines.h
+++ b/defines.h
@@ -22,8 +22,8 @@
 #endif
 
 // Redefine some Csocket debugging mechanisms to use znc's
-#define CS_DEBUG(f)	DEBUG(__FILE__ << ":" << __LINE__ << " " << f)
-#define PERROR(f)	DEBUG(__FILE__ << ":" << __LINE__ << " " << f << ": " << strerror(GetSockError()))
+#define CS_DEBUG(f)  DEBUG(__FILE__ << ":" << __LINE__ << " " << f)
+#define PERROR(f)    DEBUG(__FILE__ << ":" << __LINE__ << " " << f << ": " << strerror(GetSockError()))
 
 
 #endif // !_DEFINES_H