Fix a bunch of broken indentation.

78 files changed, 247 insertions, 247 deletions

diff --git a/include/access.h b/include/access.h
index 4df23ebd8..41958fc66 100644
--- a/include/access.h
+++ b/include/access.h
@@ -80,7 +80,7 @@ class CoreExport ChanAccess : public Serializable
  public:
 	typedef std::vector<ChanAccess *> Path;
 
- 	/* The provider that created this access entry */
+	/* The provider that created this access entry */
 	AccessProvider *provider;
 	/* Channel this access entry is on */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport AccessGroup
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
- 	const ChannelInfo *ci;
+	const ChannelInfo *ci;
 	/* Account these entries affect, if any */
 	const NickCore *nc;
 	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
diff --git a/include/account.h b/include/account.h
index 58dad381e..ad6e8ebac 100644
--- a/include/account.h
+++ b/include/account.h
@@ -45,7 +45,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
 	Serialize::Reference<NickCore> nc;
 
- 	/** Constructor
+	/** Constructor
 	 * @param nickname The nick
 	 * @param nickcore The nickcore for this nick
 	 */
@@ -55,7 +55,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
- 	/** Set a vhost for the user
+	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
@@ -108,7 +108,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
  public:
- 	/* Name of the account. Find(display)->nc == this. */
+	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
 	Anope::string pass;
@@ -242,7 +242,7 @@ class CoreExport IdentifyRequest
 	virtual ~IdentifyRequest();
 
  public:
- 	/* One of these is called when the request goes through */
+	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;
 
diff --git a/include/base.h b/include/base.h
index 28e41a690..0c1021b9d 100644
--- a/include/base.h
+++ b/include/base.h
@@ -50,7 +50,7 @@ class Reference : public ReferenceBase
  protected:
 	T *ref;
  public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}
 
diff --git a/include/channels.h b/include/channels.h
index 48974065f..7e89fcff0 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -41,7 +41,7 @@ class CoreExport Channel : public Base, public Extensible
 	ModeList modes;
 
  public:
- 	/* Channel name */
+	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport Channel : public Base, public Extensible
 	/** See if a channel has a mode
 	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
 	size_t HasMode(const Anope::string &name, const Anope::string &param = "");
 
diff --git a/include/commands.h b/include/commands.h
index 871524fb1..bd9cd0230 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -101,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;
 
  public:
- 	/* Maximum paramaters accepted by this command */
+	/* Maximum paramaters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -136,11 +136,11 @@ class CoreExport Command : public Service
 	bool AllowUnregistered() const;
 	bool RequireUser() const;
 
- 	/** Get the command description
+	/** Get the command description
 	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	virtual const Anope::string GetDesc(CommandSource &source) const;
+	virtual const Anope::string GetDesc(CommandSource &source) const;
 
 	/** Execute this command.
 	 * @param source The source
diff --git a/include/config.h b/include/config.h
index 5d79136db..30d9255b8 100644
--- a/include/config.h
+++ b/include/config.h
@@ -35,7 +35,7 @@ namespace Configuration
 		int linenum;
 
 	 public:
-	 	Block(const Anope::string &);
+		Block(const Anope::string &);
 		const Anope::string &GetName() const;
 		int CountBlock(const Anope::string &name);
 		Block* GetBlock(const Anope::string &name, int num = 0);
diff --git a/include/extensible.h b/include/extensible.h
index d57799737..abb4af13b 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -164,7 +164,7 @@ template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
@@ -186,7 +186,7 @@ template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
diff --git a/include/lists.h b/include/lists.h
index 3c728aa10..c0a9604f1 100644
--- a/include/lists.h
+++ b/include/lists.h
@@ -64,7 +64,7 @@ class CoreExport NumberList
 class CoreExport ListFormatter
 {
  public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
+	typedef std::map<Anope::string, Anope::string> ListEntry;
  private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
diff --git a/include/logger.h b/include/logger.h
index fed6c51dd..85718cf32 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -52,7 +52,7 @@ struct LogFile
 class CoreExport Log
 {
  public:
- 	/* Bot that should log this message */
+	/* Bot that should log this message */
 	BotInfo *bi;
 	/* For commands, the user executing the command, but might not always exist */
 	User *u;
@@ -113,7 +113,7 @@ class CoreExport Log
 class CoreExport LogInfo
 {
  public:
- 	BotInfo *bot;
+	BotInfo *bot;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
 	int last_day;
diff --git a/include/mail.h b/include/mail.h
index 2c0d3e2a4..030e50efb 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -26,7 +26,7 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
-	 	Anope::string sendmail_path;
+		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
@@ -36,7 +36,7 @@ namespace Mail
 
 		bool success;
 	 public:
-	 	/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
 		 * @param addr Destination address to mail
diff --git a/include/memo.h b/include/memo.h
index 6544efcc3..6be934bb8 100644
--- a/include/memo.h
+++ b/include/memo.h
@@ -19,9 +19,9 @@ class CoreExport Memo : public Serializable
 {
  public:
 	MemoInfo *mi;
- 	bool unread;
+	bool unread;
 	bool receipt;
- 	Memo();
+	Memo();
 	~Memo();
 
 	void Serialize(Serialize::Data &data) const anope_override;
diff --git a/include/messages.h b/include/messages.h
index 6d683408f..53d1200f3 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -165,7 +165,7 @@ namespace Message
 
 	struct CoreExport Whois : IRCDMessage
 	{
- 		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 	};
diff --git a/include/modes.h b/include/modes.h
index bd7966864..d3134d4f0 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -39,8 +39,8 @@ enum ModeClass
 class CoreExport Mode : public Base
 {
  public:
- 	/* Mode name */
- 	Anope::string name;
+	/* Mode name */
+	Anope::string name;
 	/* Class of mode this is (user/channel) */
 	ModeClass mclass;
 	/* Mode char for this, eg 'b' */
@@ -78,7 +78,7 @@ class CoreExport UserMode : public Mode
 class CoreExport UserModeParam : public UserMode
 {
  public:
- 	/** constructor
+	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
 	 */
@@ -229,9 +229,9 @@ class CoreExport ChannelStatus
 {
 	Anope::string modes;
  public:
- 	ChannelStatus();
- 	ChannelStatus(const Anope::string &modes);
- 	void AddMode(char c);
+	ChannelStatus();
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
 	void DelMode(char c);
 	bool HasMode(char c) const;
 	bool Empty() const;
@@ -399,7 +399,7 @@ class CoreExport Entry
 	Anope::string nick, user, host, real;
 
 	/** Constructor
- 	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
 	 * @param host A full or poartial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);
diff --git a/include/modules.h b/include/modules.h
index abf1808c6..05eb60230 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1138,7 +1138,7 @@ class CoreExport ModuleManager
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];
 
- 	/** List of all modules loaded in Anope
+	/** List of all modules loaded in Anope
 	 */
 	static std::list<Module *> Modules;
 
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 1a5658dd1..ca2a6bcaa 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -37,6 +37,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}
 
  public:
- 	virtual ~LogSettings() { }
+	virtual ~LogSettings() { }
 	virtual LogSetting *Create() = 0;
 };
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index 480217e59..4ac2e1450 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -74,7 +74,7 @@ struct ModeLocks
 
 	/** Get details for a specific mlock
 	 * @param mname The mode name
- 	 * @param An optional param to match with
+	 * @param An optional param to match with
 	 * @return The MLock, if any
 	 */
 	virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string &param = "") = 0;
diff --git a/include/modules/dns.h b/include/modules/dns.h
index c9c6c9088..c35144210 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -139,8 +139,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
-	 	/* Creator of this request */
+		unsigned short id;
+		/* Creator of this request */
 		Module *creator;
 
 		Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index f72d95910..fccd77dc8 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -17,7 +17,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-	 	virtual ~Context() { }
+		virtual ~Context() { }
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 0e9b1196e..338254c1f 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -99,7 +99,7 @@ class HTTPPage : public Base
 	Anope::string content_type;
 
  public:
- 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
+	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
 
 	const Anope::string &GetURL() const { return this->url; }
 
@@ -137,7 +137,7 @@ class HTTPClient : public ClientSocket, public BinarySocket, public Base
 
 class HTTPProvider : public ListenSocket, public Service
 {
- 	Anope::string ip;
+	Anope::string ip;
 	unsigned short port;
 	bool ssl;
  public:
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index 0c064f895..034937412 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -35,7 +35,7 @@ struct Exception : Serializable
 class SessionService : public Service
 {
  public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
diff --git a/include/modules/sql.h b/include/modules/sql.h
index a70f25dc6..47b2a7aef 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -12,7 +12,7 @@ namespace SQL
 	class Data : public Serialize::Data
 	{
 	 public:
- 		typedef std::map<Anope::string, std::stringstream *> Map;
+		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;
 
@@ -142,7 +142,7 @@ namespace SQL
 		Anope::string error;
 	 public:
 		unsigned int id;
- 		Anope::string finished_query;
+		Anope::string finished_query;
 
 		Result() : id(0) { }
 		Result(unsigned int i, const Query &q, const Anope::string &fq, const Anope::string &err = "") : query(q), error(err), id(i), finished_query(fq) { }
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index 61388c68e..9ac452b12 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -28,7 +28,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
  public:
- 	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() { }
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
diff --git a/include/opertype.h b/include/opertype.h
index 23c3bfcf4..c239010a7 100644
--- a/include/opertype.h
+++ b/include/opertype.h
@@ -67,7 +67,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
  public:
- 	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifys using this opertype
 	 */
 	Anope::string modes;
 
diff --git a/include/protocol.h b/include/protocol.h
index 1f3b8c026..44f8d3017 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -22,7 +22,7 @@ class CoreExport IRCDProto : public Service
 	Anope::string proto_name;
 
  protected:
- 	IRCDProto(Module *creator, const Anope::string &proto_name);
+	IRCDProto(Module *creator, const Anope::string &proto_name);
  public:
 	virtual ~IRCDProto();
 
diff --git a/include/regchannel.h b/include/regchannel.h
index d7098aef9..f884c27b3 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -36,7 +36,7 @@ class CoreExport AutoKick : public Serializable
 	time_t addtime;
 	time_t last_used;
 
- 	AutoKick();
+	AutoKick();
 	~AutoKick();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
@@ -56,7 +56,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	Anope::map<int16_t> levels;
 
  public:
- 	friend class ChanAccess;
+	friend class ChanAccess;
 	friend class AutoKick;
 
 	Anope::string name;                       /* Channel name */
@@ -82,7 +82,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 
 	time_t banexpire;                       /* Time bans expire in */
 
- 	/** Constructor
+	/** Constructor
 	 * @param chname The channel name
 	 */
 	ChannelInfo(const Anope::string &chname);
diff --git a/include/regexpr.h b/include/regexpr.h
index fe621f31a..166ea3fb6 100644
--- a/include/regexpr.h
+++ b/include/regexpr.h
@@ -30,7 +30,7 @@ class CoreExport Regex
  protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
  public:
- 	virtual ~Regex() { }
+	virtual ~Regex() { }
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
 };
diff --git a/include/serialize.h b/include/serialize.h
index d9c888b65..79273f429 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -22,7 +22,7 @@ namespace Serialize
 	class Data
 	{
 	 public:
- 		enum Type
+		enum Type
 		{
 			DT_TEXT,
 			DT_INT
@@ -62,7 +62,7 @@ class CoreExport Serializable : public virtual Base
 	friend class Serialize::Type;
 	/* The type of item this object is */
 	Serialize::Type *s_type;
- 	/* Iterator into serializable_items */
+	/* Iterator into serializable_items */
 	std::list<Serializable *>::iterator s_iter;
 	/* The hash of the last serialized form of this object committed to the database */
 	size_t last_commit;
@@ -70,7 +70,7 @@ class CoreExport Serializable : public virtual Base
 	time_t last_commit_time;
 
  protected:
- 	Serializable(const Anope::string &serialize_type);
+	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);
 
 	Serializable &operator=(const Serializable &);
@@ -78,7 +78,7 @@ class CoreExport Serializable : public virtual Base
  public:
 	virtual ~Serializable();
 
- 	/* Unique ID (per type, not globally) for this object */
+	/* Unique ID (per type, not globally) for this object */
 	uint64_t id;
 
 	/* Only used by redis, to ignore updates */
@@ -130,7 +130,7 @@ class CoreExport Serialize::Type : public Base
 	time_t timestamp;
 
  public:
- 	/* Map of Serializable::id to Serializable objects */
+	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;
 
 	/** Creates a new serializable type
@@ -247,7 +247,7 @@ class Serialize::Reference : public ReferenceBase
 	T *ref;
 
  public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}
 
diff --git a/include/servers.h b/include/servers.h
index 4726b8e03..11955d85c 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -79,8 +79,8 @@ class CoreExport Server : public Extensible
 	~Server();
 
  public:
- 	/* Number of users on the server */
- 	unsigned users;
+	/* Number of users on the server */
+	unsigned users;
 
 	/** Delete this server with a reason
 	 * @param reason The reason
diff --git a/include/service.h b/include/service.h
index 23433bf4d..0e09254ac 100644
--- a/include/service.h
+++ b/include/service.h
@@ -43,7 +43,7 @@ class CoreExport Service : public virtual Base
 	}
 
  public:
- 	static Service *FindService(const Anope::string &t, const Anope::string &n)
+	static Service *FindService(const Anope::string &t, const Anope::string &n)
 	{
 		std::map<Anope::string, std::map<Anope::string, Service *> >::const_iterator it = Services.find(t);
 		if (it == Services.end())
@@ -122,7 +122,7 @@ class ServiceReference : public Reference<T>
 	Anope::string name;
 
  public:
- 	ServiceReference() { }
+	ServiceReference() { }
 
 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
 	{
diff --git a/include/sockets.h b/include/sockets.h
index eee951eac..40a906d47 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -98,7 +98,7 @@ class CoreExport cidr
 	Anope::string cidr_ip;
 	unsigned short cidr_len;
  public:
- 	cidr(const Anope::string &ip);
+	cidr(const Anope::string &ip);
 	cidr(const Anope::string &ip, unsigned char len);
 	cidr(const sockaddrs &ip, unsigned char len);
 	Anope::string mask() const;
@@ -147,7 +147,7 @@ class CoreExport SocketIO
 	virtual ~SocketIO() { }
 
 	/** Receive something from the buffer
- 	 * @param s The socket
+	 * @param s The socket
 	 * @param buf The buf to read to
 	 * @param sz How much to read
 	 * @return Number of bytes received
@@ -208,13 +208,13 @@ class CoreExport Socket
 	bool ipv6;
 
  public:
- 	std::bitset<SF_SIZE> flags;
+	std::bitset<SF_SIZE> flags;
 
 	/* Sockaddrs for bind() (if it's bound) */
 	sockaddrs bindaddr;
 
 	/* I/O functions used for this socket */
- 	SocketIO *io;
+	SocketIO *io;
 
 	/** Empty constructor, should not be called.
 	 */
@@ -225,7 +225,7 @@ class CoreExport Socket
 	 * @param ipv6 true if using ipv6
 	 * @param type The socket type, defaults to SOCK_STREAM
 	 */
- 	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
+	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
 
 	/** Destructor, closes the socket and removes it from the engine
 	 */
@@ -277,8 +277,8 @@ class CoreExport Socket
 class CoreExport BufferedSocket : public virtual Socket
 {
  protected:
- 	/* Things read from the socket */
- 	Anope::string read_buffer;
+	/* Things read from the socket */
+	Anope::string read_buffer;
 	/* Things to be written to the socket */
 	Anope::string write_buffer;
 	/* How much data was received from this socket on this recv() */
@@ -385,8 +385,8 @@ class CoreExport ListenSocket : public virtual Socket
 	bool ProcessRead();
 
 	/** Called when a connection is accepted
- 	 * @param fd The FD for the new connection
- 	 * @param addr The sockaddr for where the connection came from
+	 * @param fd The FD for the new connection
+	 * @param addr The sockaddr for where the connection came from
 	 * @return The new socket
 	 */
 	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0;
@@ -462,10 +462,10 @@ class CoreExport ClientSocket : public virtual Socket
 class CoreExport Pipe : public Socket
 {
  public:
- 	/** The FD of the write pipe
+	/** The FD of the write pipe
 	 * this->sock is the readfd
 	 */
- 	int write_pipe;
+	int write_pipe;
 
 	Pipe();
 	~Pipe();
diff --git a/include/timers.h b/include/timers.h
index 55004e24a..d31d9cb12 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -17,7 +17,7 @@
 class CoreExport Timer
 {
  private:
- 	/** The owner of the timer, if any
+	/** The owner of the timer, if any
 	 */
 	Module *owner;
 
diff --git a/include/uplink.h b/include/uplink.h
index 63858af4b..257c6157c 100644
--- a/include/uplink.h
+++ b/include/uplink.h
@@ -38,9 +38,9 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 		std::stringstream buffer;
 
 	 public:
-	 	Message();
-	 	Message(const MessageSource &);
-	 	~Message();
+		Message();
+		Message(const MessageSource &);
+		~Message();
 		template<typename T> Message &operator<<(const T &val)
 		{
 			this->buffer << val;
diff --git a/include/users.h b/include/users.h
index a6954bbdb..b941d0dff 100644
--- a/include/users.h
+++ b/include/users.h
@@ -56,7 +56,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 
 
  public: // XXX: exposing a tiny bit too much
- 	/* User's current nick */
+	/* User's current nick */
 	Anope::string nick;
 
 	/* User's real hostname */
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 63a2e659c..d26d612b1 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -46,7 +46,7 @@ class CommandBSAssign : public Command
 		}
 
 		AccessGroup access = source.AccessFor(ci);
- 		if (ci->HasExt("BS_NOBOT") || (!access.HasPriv("ASSIGN") && !source.HasPriv("botserv/administration")))
+		if (ci->HasExt("BS_NOBOT") || (!access.HasPriv("ASSIGN") && !source.HasPriv("botserv/administration")))
 		{
 			source.Reply(ACCESS_DENIED);
 			return;
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index dcd78c82d..43e30a9eb 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -718,7 +718,7 @@ class CommandBSKickRepeat : public CommandBSKickBase
 class CommandBSKickReverses : public CommandBSKickBase
 {
  public:
- 	CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3)
+	CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3)
 	{
 		this->SetDesc(_("Configures reverses kicker"));
 		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037} [\037ttb\037]"));
@@ -934,7 +934,7 @@ struct BanData
 	data_type data_map;
 
  public:
- 	BanData(Extensible *) { }
+	BanData(Extensible *) { }
 
 	Data &get(const Anope::string &key)
 	{
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 1bd8e289f..e4bc750c4 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -69,7 +69,7 @@ class CommandBSSet : public Command
 class CommandBSSetBanExpire : public Command
 {
  public:
- 	class UnbanTimer : public Timer
+	class UnbanTimer : public Timer
 	{
 		Anope::string chname;
 		Anope::string mask;
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 263b1917b..d2578130e 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -25,7 +25,7 @@ class AccessChanAccess : public ChanAccess
  public:
 	int level;
 
- 	AccessChanAccess(AccessProvider *p) : ChanAccess(p), level(0)
+	AccessChanAccess(AccessProvider *p) : ChanAccess(p), level(0)
 	{
 	}
 
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 6e83722c8..6f8abf4f5 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -16,7 +16,7 @@ static Module *me;
 class TempBan : public Timer
 {
  private:
- 	Anope::string channel;
+	Anope::string channel;
 	Anope::string mask;
 	Anope::string mode;
 
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 9ae6aeb56..c0910ec6f 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -18,7 +18,7 @@ class FlagsChanAccess : public ChanAccess
  public:
 	std::set<char> flags;
 
- 	FlagsChanAccess(AccessProvider *p) : ChanAccess(p)
+	FlagsChanAccess(AccessProvider *p) : ChanAccess(p)
 	{
 	}
 
diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp
index 655daa488..ee3cd484b 100644
--- a/modules/commands/cs_log.cpp
+++ b/modules/commands/cs_log.cpp
@@ -81,7 +81,7 @@ struct LogSettingsImpl : LogSettings
 {
 	LogSettingsImpl(Extensible *) { }
 
- 	~LogSettingsImpl()
+	~LogSettingsImpl()
 	{
 		for (iterator it = (*this)->begin(); it != (*this)->end();)
 		{
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index a666f6c68..6df197a6c 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -879,7 +879,7 @@ class CommandCSModes : public Command
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "on " << targ->nick;
 	}
 
- 	const Anope::string GetDesc(CommandSource &source) const anope_override
+	const Anope::string GetDesc(CommandSource &source) const anope_override
 	{
 		const std::pair<bool, Anope::string> &m = modes[source.command];
 		if (!m.second.empty())
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index e2e02aa7d..795b23e38 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -22,7 +22,7 @@ class XOPChanAccess : public ChanAccess
  public:
 	Anope::string type;
 
- 	XOPChanAccess(AccessProvider *p) : ChanAccess(p)
+	XOPChanAccess(AccessProvider *p) : ChanAccess(p)
 	{
 	}
 
@@ -484,7 +484,7 @@ class CommandCSXOP : public Command
 		this->SetSyntax(_("\037channel\037 CLEAR"));
 	}
 
- 	const Anope::string GetDesc(CommandSource &source) const anope_override
+	const Anope::string GetDesc(CommandSource &source) const anope_override
 	{
 		return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str());
 	}
diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index 1273d5a2e..0659b44ba 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -144,7 +144,7 @@ class CommandNSAJoin : public Command
 			else if (i != (*channels)->size())
 				alreadyadded += chan + ", ";
 			else if (IRCD->IsChannelValid(chan) == false)
-	 			source.Reply(CHAN_X_INVALID, chan.c_str());
+				source.Reply(CHAN_X_INVALID, chan.c_str());
 			else
 			{
 				Channel *c = Channel::Find(chan);
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index 933bfffd0..1831c4a4a 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -33,7 +33,7 @@ struct NSCertListImpl : NSCertList
 	std::vector<Anope::string> certs;
 
  public:
- 	NSCertListImpl(Extensible *obj) : nc(anope_dynamic_static_cast<NickCore *>(obj)) { }
+	NSCertListImpl(Extensible *obj) : nc(anope_dynamic_static_cast<NickCore *>(obj)) { }
 
 	~NSCertListImpl()
 	{
diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp
index 84092a9d3..ab252bf69 100644
--- a/modules/commands/os_dns.cpp
+++ b/modules/commands/os_dns.cpp
@@ -91,12 +91,12 @@ class DNSServer : public Serializable
 	std::vector<Anope::string> ips;
 	unsigned limit;
 	/* wants to be in the pool */
- 	bool pooled;
+	bool pooled;
 	/* is actually in the pool */
 	bool active;
 
  public:
- 	std::set<Anope::string, ci::less> zones;
+	std::set<Anope::string, ci::less> zones;
 	time_t repool;
 
 	DNSServer(const Anope::string &sn) : Serializable("DNSServer"), server_name(sn), limit(0), pooled(false), active(false), repool(0)
diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp
index 53e54f1ab..bc1edff10 100644
--- a/modules/commands/os_info.cpp
+++ b/modules/commands/os_info.cpp
@@ -164,7 +164,7 @@ class CommandOSInfo : public Command
 			source.Reply(_("Added info to \002%s\002."), target.c_str());
 			Log(LOG_ADMIN, source, this) << "to add information to " << target;
 
-                	if (Anope::ReadOnly)
+			if (Anope::ReadOnly)
 				source.Reply(READ_ONLY_MODE);
 		}
 		else if (cmd.equals_ci("DEL"))
@@ -208,7 +208,7 @@ class CommandOSInfo : public Command
 				source.Reply(_("Deleted info from \002%s\002."), target.c_str());
 				Log(LOG_ADMIN, source, this) << "to remove information from " << target;
 
-	                	if (Anope::ReadOnly)
+				if (Anope::ReadOnly)
 					source.Reply(READ_ONLY_MODE);
 			}
 		}
@@ -227,7 +227,7 @@ class CommandOSInfo : public Command
 			source.Reply(_("Cleared info from \002%s\002."), target.c_str());
 			Log(LOG_ADMIN, source, this) << "to clear information for " << target;
 
-                	if (Anope::ReadOnly)
+			if (Anope::ReadOnly)
 				source.Reply(READ_ONLY_MODE);
 		}
 		else
diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp
index 2ace9ad28..9ec1d8e95 100644
--- a/modules/commands/os_login.cpp
+++ b/modules/commands/os_login.cpp
@@ -55,7 +55,7 @@ class CommandOSLogin : public Command
 		return true;
 	}
 
- 	const Anope::string GetDesc(CommandSource &source) const anope_override
+	const Anope::string GetDesc(CommandSource &source) const anope_override
 	{
 		return Anope::printf(Language::Translate(source.GetAccount(), _("Login to %s")), source.service->nick.c_str());
 	}
@@ -97,7 +97,7 @@ class CommandOSLogout : public Command
 		return true;
 	}
 
- 	const Anope::string GetDesc(CommandSource &source) const anope_override
+	const Anope::string GetDesc(CommandSource &source) const anope_override
 	{
 		return Anope::printf(Language::Translate(source.GetAccount(), _("Logout from %s")), source.service->nick.c_str());
 	}
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index 18a8ec286..b21febf9a 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -57,7 +57,7 @@ class SXLineDelCallback : public NumberList
 class CommandOSSXLineBase : public Command
 {
  private:
- 	virtual XLineManager* xlm() = 0;
+	virtual XLineManager* xlm() = 0;
 
 	virtual void OnAdd(CommandSource &source, const std::vector<Anope::string> &params) = 0;
 
@@ -420,7 +420,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 
 	ServiceReference<XLineManager> snlines;
  public:
- 	CommandOSSNLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/snline"), snlines("XLineManager", "xlinemanager/snline")
+	CommandOSSNLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/snline"), snlines("XLineManager", "xlinemanager/snline")
 	{
 		this->SetSyntax(_("ADD [+\037expiry\037] \037mask\037:\037reason\037"));
 		this->SetSyntax(_("DEL {\037mask\037 | \037entry-num\037 | \037list\037 | \037id\037}"));
@@ -652,7 +652,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
 			source.Reply(READ_ONLY_MODE);
 	}
 
- 	ServiceReference<XLineManager> sqlines;
+	ServiceReference<XLineManager> sqlines;
  public:
 	CommandOSSQLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/sqline"), sqlines("XLineManager", "xlinemanager/sqline")
 	{
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 228f0f4ca..24278e001 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -18,7 +18,7 @@
 class SaveData : public Serialize::Data
 {
  public:
- 	Anope::string last;
+	Anope::string last;
 	std::fstream *fs;
 
 	SaveData() : fs(NULL) { }
@@ -38,7 +38,7 @@ class SaveData : public Serialize::Data
 class LoadData : public Serialize::Data
 {
  public:
- 	std::fstream *fs;
+	std::fstream *fs;
 	unsigned int id;
 	std::map<Anope::string, Anope::string> data;
 	std::stringstream ss;
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 6b179fa79..66db18834 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -81,8 +81,8 @@ else \
 #define OLD_BS_NOBOT			0x00000020
 
 /* BotServ Kickers flags */
-#define OLD_BS_KICK_BOLDS 		0x80000000
-#define OLD_BS_KICK_COLORS 		0x40000000
+#define OLD_BS_KICK_BOLDS		0x80000000
+#define OLD_BS_KICK_COLORS		0x40000000
 #define OLD_BS_KICK_REVERSES	0x20000000
 #define OLD_BS_KICK_UNDERLINES	0x10000000
 #define OLD_BS_KICK_BADWORDS	0x08000000
diff --git a/modules/encryption/enc_md5.cpp b/modules/encryption/enc_md5.cpp
index c76e25b8b..9db5f8937 100644
--- a/modules/encryption/enc_md5.cpp
+++ b/modules/encryption/enc_md5.cpp
@@ -321,7 +321,7 @@ class MD5Context : public Encryption::Context
 class MD5Provider : public Encryption::Provider
 {
  public:
- 	MD5Provider(Module *creator) : Encryption::Provider(creator, "md5") { }
+	MD5Provider(Module *creator) : Encryption::Provider(creator, "md5") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) anope_override
 	{
diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp
index 6f16d2a6c..b4778454a 100644
--- a/modules/encryption/enc_old.cpp
+++ b/modules/encryption/enc_old.cpp
@@ -17,7 +17,7 @@ static ServiceReference<Encryption::Provider> md5("Encryption::Provider", "md5")
 class OldMD5Provider : public Encryption::Provider
 {
  public:
- 	OldMD5Provider(Module *creator) : Encryption::Provider(creator, "oldmd5") { }
+	OldMD5Provider(Module *creator) : Encryption::Provider(creator, "oldmd5") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) anope_override
 	{
diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp
index 05c8669a8..7f86e0f56 100644
--- a/modules/encryption/enc_sha1.cpp
+++ b/modules/encryption/enc_sha1.cpp
@@ -181,7 +181,7 @@ class SHA1Context : public Encryption::Context
 class SHA1Provider : public Encryption::Provider
 {
  public:
- 	SHA1Provider(Module *creator) : Encryption::Provider(creator, "sha1") { }
+	SHA1Provider(Module *creator) : Encryption::Provider(creator, "sha1") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) anope_override
 	{
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index cd0c06bde..832b3fdc1 100644
--- a/modules/encryption/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
@@ -220,7 +220,7 @@ class SHA256Context : public Encryption::Context
 class SHA256Provider : public Encryption::Provider
 {
  public:
- 	SHA256Provider(Module *creator) : Encryption::Provider(creator, "sha256") { }
+	SHA256Provider(Module *creator) : Encryption::Provider(creator, "sha256") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) anope_override
 	{
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp
index 0aeda9ddc..974747ada 100644
--- a/modules/extra/m_ssl_gnutls.cpp
+++ b/modules/extra/m_ssl_gnutls.cpp
@@ -25,7 +25,7 @@ namespace GnuTLS { class X509CertCredentials; }
 class MySSLService : public SSLService
 {
  public:
- 	MySSLService(Module *o, const Anope::string &n);
+	MySSLService(Module *o, const Anope::string &n);
 
 	/** Initialize a socket to use SSL
 	 * @param s The socket
@@ -44,7 +44,7 @@ class SSLSocketIO : public SocketIO
 	SSLSocketIO();
 
 	/** Really receive something from the buffer
- 	 * @param s The socket
+	 * @param s The socket
 	 * @param buf The buf to read to
 	 * @param sz How much to read
 	 * @return Number of bytes received
diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp
index ef87f708c..e8c0d402a 100644
--- a/modules/extra/m_ssl_openssl.cpp
+++ b/modules/extra/m_ssl_openssl.cpp
@@ -24,7 +24,7 @@ static SSL_CTX *server_ctx, *client_ctx;
 class MySSLService : public SSLService
 {
  public:
- 	MySSLService(Module *o, const Anope::string &n);
+	MySSLService(Module *o, const Anope::string &n);
 
 	/** Initialize a socket to use SSL
 	 * @param s The socket
@@ -43,7 +43,7 @@ class SSLSocketIO : public SocketIO
 	SSLSocketIO();
 
 	/** Really receive something from the buffer
- 	 * @param s The socket
+	 * @param s The socket
 	 * @param buf The buf to read to
 	 * @param sz How much to read
 	 * @return Number of bytes received
diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp
index daa9a50ba..ada32db6b 100644
--- a/modules/m_dns.cpp
+++ b/modules/m_dns.cpp
@@ -468,7 +468,7 @@ class TCPSocket : public ListenSocket
 	class Client : public ClientSocket, public Timer, public ReplySocket
 	{
 		Manager *manager;
- 		Packet *packet;
+		Packet *packet;
 		unsigned char packet_buffer[524];
 		int length;
 
@@ -495,7 +495,7 @@ class TCPSocket : public ListenSocket
 			SocketEngine::Change(this, true, SF_WRITABLE);
 		}
 
-	 	bool ProcessRead() anope_override
+		bool ProcessRead() anope_override
 		{
 			Log(LOG_DEBUG_2) << "Resolver: Reading from DNS TCP socket";
 
diff --git a/modules/m_proxyscan.cpp b/modules/m_proxyscan.cpp
index bb84faa08..cc7599666 100644
--- a/modules/m_proxyscan.cpp
+++ b/modules/m_proxyscan.cpp
@@ -57,11 +57,11 @@ class ProxyConnect : public ConnectionSocket
 	static ServiceReference<XLineManager> akills;
 
  public:
- 	static std::set<ProxyConnect *> proxies;
+	static std::set<ProxyConnect *> proxies;
 
- 	ProxyCheck proxy;
+	ProxyCheck proxy;
 	unsigned short port;
- 	time_t created;
+	time_t created;
 
 	ProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ConnectionSocket(), proxy(p),
 		port(po), created(Anope::CurTime)
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 57c4e2a5a..330135ecb 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -426,7 +426,7 @@ class InspIRCd12Proto : public IRCDProto
 	void SendSVSLogin(const Anope::string &uid, const Anope::string &acc, const Anope::string &vident, const Anope::string &vhost) anope_override
 	{
 		UplinkSocket::Message(Me) << "METADATA " << uid << " accountname :" << acc;
-		
+
 		if (!vident.empty())
 			UplinkSocket::Message(Me) << "ENCAP " << uid.substr(0, 3) << " CHGIDENT " << uid << " " << vident;
 		if (!vhost.empty())
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 7cf4bf255..1b6adda61 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -184,9 +184,9 @@ namespace InspIRCdExtban
 	class AccountMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
+		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
 
 		bool Matches(User *u, const Entry *e) anope_override
 		{
@@ -200,46 +200,46 @@ namespace InspIRCdExtban
 	class RealnameMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return Anope::Match(u->realname, real_mask);
-	 	}
+		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return Anope::Match(u->realname, real_mask);
+		}
 	};
 
 	class ServerMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return Anope::Match(u->server->GetName(), real_mask);
-	 	}
+		ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return Anope::Match(u->server->GetName(), real_mask);
+		}
 	};
 
 	class FingerprintMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask);
-	 	}
+		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask);
+		}
 	};
 
 	class UnidentifiedMatcher : public InspIRCdExtBan
@@ -251,8 +251,8 @@ namespace InspIRCdExtban
 
 		bool Matches(User *u, const Entry *e) anope_override
 		{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
 			return !u->Account() && Entry("BAN", real_mask).Matches(u);
 		}
 	};
diff --git a/modules/protocol/inspircd3.cpp b/modules/protocol/inspircd3.cpp
index 0899f44eb..c26f0a56a 100644
--- a/modules/protocol/inspircd3.cpp
+++ b/modules/protocol/inspircd3.cpp
@@ -575,9 +575,9 @@ namespace InspIRCdExtban
 	class AccountMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
+		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
 
 		bool Matches(User *u, const Entry *e) anope_override
 		{
@@ -591,46 +591,46 @@ namespace InspIRCdExtban
 	class RealnameMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return Anope::Match(u->realname, real_mask);
-	 	}
+		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return Anope::Match(u->realname, real_mask);
+		}
 	};
 
 	class ServerMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return Anope::Match(u->server->GetName(), real_mask);
-	 	}
+		ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return Anope::Match(u->server->GetName(), real_mask);
+		}
 	};
 
 	class FingerprintMatcher : public InspIRCdExtBan
 	{
 	 public:
-	 	FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
-	 	{
-	 	}
-
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
-	 		return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask);
-	 	}
+		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
+		{
+		}
+
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
+			return !u->fingerprint.empty() && Anope::Match(u->fingerprint, real_mask);
+		}
 	};
 
 	class UnidentifiedMatcher : public InspIRCdExtBan
@@ -642,8 +642,8 @@ namespace InspIRCdExtban
 
 		bool Matches(User *u, const Entry *e) anope_override
 		{
-	 		const Anope::string &mask = e->GetMask();
-	 		Anope::string real_mask = mask.substr(2);
+			const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(2);
 			return !u->Account() && Entry("BAN", real_mask).Matches(u);
 		}
 	};
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 0c9516973..89aaf0daf 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -116,7 +116,7 @@ class ngIRCdProto : public IRCDProto
 	void SendLogout(User *u) anope_override
 	{
 		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :";
-	} 
+	}
 
 	/* SERVER name hop descript */
 	void SendServer(const Server *server) anope_override
@@ -509,8 +509,8 @@ struct IRCDMessageServer : IRCDMessage
 	 * New directly linked server:
 	 *
 	 * SERVER tolsun.oulu.fi 1 :Experimental server
-	 * 	New server tolsun.oulu.fi introducing itself
-	 * 	and attempting to register.
+	 *   New server tolsun.oulu.fi introducing itself
+	 *   and attempting to register.
 	 *
 	 * params[0] = servername
 	 * params[1] = hop count
@@ -519,10 +519,10 @@ struct IRCDMessageServer : IRCDMessage
 	 * New remote server in the network:
 	 *
 	 * :tolsun.oulu.fi SERVER csd.bu.edu 5 34 :BU Central Server
-	 *	Server tolsun.oulu.fi is our uplink for csd.bu.edu
-	 *	which is 5 hops away. The token "34" will be used
-	 *	by tolsun.oulu.fi when introducing new users or
-	 *	services connected to csd.bu.edu.
+	 *   Server tolsun.oulu.fi is our uplink for csd.bu.edu
+	 *   which is 5 hops away. The token "34" will be used
+	 *   by tolsun.oulu.fi when introducing new users or
+	 *   services connected to csd.bu.edu.
 	 *
 	 * params[0] = servername
 	 * params[1] = hop count
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 706cf7d0f..99c382e78 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -482,11 +482,11 @@ namespace UnrealExtban
 	class EntryMatcher : public UnrealExtBan
 	{
 	 public:
-	 	EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
@@ -498,11 +498,11 @@ namespace UnrealExtban
 	class RealnameMatcher : public UnrealExtBan
 	{
 	 public:
-	 	RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
@@ -514,11 +514,11 @@ namespace UnrealExtban
 	class RegisteredMatcher : public UnrealExtBan
 	{
 	 public:
-	 	RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			return u->HasMode("REGISTERED") && mask.equals_ci(u->nick);
@@ -528,17 +528,17 @@ namespace UnrealExtban
 	class AccountMatcher : public UnrealExtBan
 	{
 	 public:
-	 	AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-	 		return u->Account() && Anope::Match(u->Account()->display, real_mask);
-	 	}
+			return u->Account() && Anope::Match(u->Account()->display, real_mask);
+		}
 	};
 }
 
diff --git a/modules/protocol/unreal4.cpp b/modules/protocol/unreal4.cpp
index f48981739..9089857ac 100644
--- a/modules/protocol/unreal4.cpp
+++ b/modules/protocol/unreal4.cpp
@@ -497,11 +497,11 @@ namespace UnrealExtban
 	class EntryMatcher : public UnrealExtBan
 	{
 	 public:
-	 	EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
@@ -513,11 +513,11 @@ namespace UnrealExtban
 	class RealnameMatcher : public UnrealExtBan
 	{
 	 public:
-	 	RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
@@ -529,11 +529,11 @@ namespace UnrealExtban
 	class RegisteredMatcher : public UnrealExtBan
 	{
 	 public:
-	 	RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
+		bool Matches(User *u, const Entry *e) anope_override
 		{
 			const Anope::string &mask = e->GetMask();
 			return u->HasMode("REGISTERED") && mask.equals_ci(u->nick);
@@ -543,17 +543,17 @@ namespace UnrealExtban
 	class AccountMatcher : public UnrealExtBan
 	{
 	 public:
-	 	AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
-	 	{
-	 	}
+		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+		{
+		}
 
-	 	bool Matches(User *u, const Entry *e) anope_override
-	 	{
-	 		const Anope::string &mask = e->GetMask();
+		bool Matches(User *u, const Entry *e) anope_override
+		{
+			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-	 		return u->Account() && Anope::Match(u->Account()->display, real_mask);
-	 	}
+			return u->Account() && Anope::Match(u->Account()->display, real_mask);
+		}
 	};
 
 	class FingerprintMatcher : public UnrealExtBan
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index 2344f45d5..b532df707 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -45,7 +45,7 @@ class ChanServCore : public Module, public ChanServService
 			Reference<Channel> c;
 
 		 public:
-		 	/** Constructor
+			/** Constructor
 			 * @param chan The channel
 			 */
 			ChanServTimer(Reference<BotInfo> &cs, ExtensibleItem<bool> &i, Module *m, Channel *chan) : Timer(m, Config->GetModule(m)->Get<time_t>("inhabit", "15s")), ChanServ(cs), inhabit(i), c(chan)
diff --git a/modules/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h
index 541126e84..97072e45d 100644
--- a/modules/webcpanel/pages/chanserv/access.h
+++ b/modules/webcpanel/pages/chanserv/access.h
@@ -14,7 +14,7 @@ namespace ChanServ
 class Access : public WebPanelProtectedPage
 {
  public:
- 	Access(const Anope::string &cat, const Anope::string &u);
+	Access(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 
diff --git a/modules/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h
index d041bd46b..6ebbfafd4 100644
--- a/modules/webcpanel/pages/chanserv/akick.h
+++ b/modules/webcpanel/pages/chanserv/akick.h
@@ -14,7 +14,7 @@ namespace ChanServ
 class Akick : public WebPanelProtectedPage
 {
  public:
- 	Akick(const Anope::string &cat, const Anope::string &u);
+	Akick(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 
diff --git a/modules/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h
index 2af7e86b0..51b186b19 100644
--- a/modules/webcpanel/pages/chanserv/info.h
+++ b/modules/webcpanel/pages/chanserv/info.h
@@ -14,7 +14,7 @@ namespace ChanServ
 class Info : public WebPanelProtectedPage
 {
  public:
- 	Info(const Anope::string &cat, const Anope::string &u);
+	Info(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h
index 75131b8ac..7ec6d3137 100644
--- a/modules/webcpanel/pages/chanserv/set.h
+++ b/modules/webcpanel/pages/chanserv/set.h
@@ -14,7 +14,7 @@ namespace ChanServ
 class Set : public WebPanelProtectedPage
 {
  public:
- 	Set(const Anope::string &cat, const Anope::string &u);
+	Set(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 
diff --git a/modules/webcpanel/pages/hostserv/request.h b/modules/webcpanel/pages/hostserv/request.h
index ea2a61f19..3d3ab5c8a 100644
--- a/modules/webcpanel/pages/hostserv/request.h
+++ b/modules/webcpanel/pages/hostserv/request.h
@@ -14,7 +14,7 @@ namespace HostServ
 class Request : public WebPanelProtectedPage
 {
  public:
- 	Request(const Anope::string &cat, const Anope::string &u);
+	Request(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/logout.h b/modules/webcpanel/pages/logout.h
index cfb93b8f5..787d4876f 100644
--- a/modules/webcpanel/pages/logout.h
+++ b/modules/webcpanel/pages/logout.h
@@ -11,7 +11,7 @@ namespace WebCPanel
 class Logout : public WebPanelProtectedPage
 {
  public:
- 	Logout(const Anope::string &u);
+	Logout(const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memos.h
index c80f87879..e5981ac95 100644
--- a/modules/webcpanel/pages/memoserv/memos.h
+++ b/modules/webcpanel/pages/memoserv/memos.h
@@ -14,7 +14,7 @@ namespace MemoServ
 class Memos : public WebPanelProtectedPage
 {
  public:
- 	Memos(const Anope::string &cat, const Anope::string &u);
+	Memos(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/nickserv/access.h b/modules/webcpanel/pages/nickserv/access.h
index ebf8f1da9..9b2198cca 100644
--- a/modules/webcpanel/pages/nickserv/access.h
+++ b/modules/webcpanel/pages/nickserv/access.h
@@ -14,7 +14,7 @@ namespace NickServ
 class Access : public WebPanelProtectedPage
 {
  public:
- 	Access(const Anope::string &cat, const Anope::string &u);
+	Access(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h
index 94f898b9f..6263985fd 100644
--- a/modules/webcpanel/pages/nickserv/alist.h
+++ b/modules/webcpanel/pages/nickserv/alist.h
@@ -14,7 +14,7 @@ namespace NickServ
 class Alist : public WebPanelProtectedPage
 {
  public:
- 	Alist(const Anope::string &cat, const Anope::string &u);
+	Alist(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h
index ba5307821..521ce4ac4 100644
--- a/modules/webcpanel/pages/nickserv/cert.h
+++ b/modules/webcpanel/pages/nickserv/cert.h
@@ -14,7 +14,7 @@ namespace NickServ
 class Cert : public WebPanelProtectedPage
 {
  public:
- 	Cert(const Anope::string &cat, const Anope::string &u);
+	Cert(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/modules/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h
index 883e9e3ce..0c8a5b3d6 100644
--- a/modules/webcpanel/pages/nickserv/info.h
+++ b/modules/webcpanel/pages/nickserv/info.h
@@ -14,7 +14,7 @@ namespace NickServ
 class Info : public WebPanelProtectedPage
 {
  public:
- 	Info(const Anope::string &cat, const Anope::string &u);
+	Info(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) anope_override;
 };
diff --git a/src/protocol.cpp b/src/protocol.cpp
index dd2595992..a0dad2f96 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -359,7 +359,7 @@ bool IRCDProto::IsNickValid(const Anope::string &nick)
 	 **/
 
 	 if (nick.empty())
-	 	return false;
+		return false;
 
 	Anope::string special = "[]\\`_^{|}";
 
diff --git a/src/users.cpp b/src/users.cpp
index 5bca663d6..62230ba63 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -381,7 +381,7 @@ void User::Identify(NickAlias *na)
 		if (IRCD->CanSetVHost && !this->nc->o->vhost.empty())
 		{
 			this->SendMessage(NULL, "Changing your vhost to \002%s\002", this->nc->o->vhost.c_str());
- 			this->SetDisplayedHost(this->nc->o->vhost);
+			this->SetDisplayedHost(this->nc->o->vhost);
 			IRCD->SendVhost(this, "", this->nc->o->vhost);
 		}
 	}
@@ -541,7 +541,7 @@ void User::SetModeInternal(const MessageSource &source, UserMode *um, const Anop
 			if (IRCD->CanSetVHost && !this->nc->o->vhost.empty())
 			{
 				this->SendMessage(NULL, "Changing your vhost to \002%s\002", this->nc->o->vhost.c_str());
- 				this->SetDisplayedHost(this->nc->o->vhost);
+				this->SetDisplayedHost(this->nc->o->vhost);
 				IRCD->SendVhost(this, "", this->nc->o->vhost);
 			}
 		}