Remove some unnecessary spaces that break editor indentation.

240 files changed, 808 insertions, 808 deletions

diff --git a/include/access.h b/include/access.h
index f22e098bf..3ee6e7896 100644
--- a/include/access.h
+++ b/include/access.h
@@ -41,7 +41,7 @@ struct CoreExport Privilege
 class CoreExport PrivilegeManager
 {
 	static std::vector<Privilege> Privileges;
- public:
+public:
 	static void AddPrivilege(Privilege p);
 	static void RemovePrivilege(Privilege &p);
 	static Privilege *FindPrivilege(const Anope::string &name);
@@ -54,7 +54,7 @@ class CoreExport PrivilegeManager
  */
 class CoreExport AccessProvider : public Service
 {
- public:
+public:
 	AccessProvider(Module *owner, const Anope::string &name);
 	virtual ~AccessProvider();
 
@@ -63,9 +63,9 @@ class CoreExport AccessProvider : public Service
 	 */
 	virtual ChanAccess *Create() = 0;
 
- private:
+private:
 	static std::list<AccessProvider *> Providers;
- public:
+public:
 	static const std::list<AccessProvider *>& GetProviders();
 };
 
@@ -76,7 +76,7 @@ class CoreExport ChanAccess : public Serializable
 	/* account this access entry is for, if any */
 	Serialize::Reference<NickCore> nc;
 
- public:
+public:
 	typedef std::vector<ChanAccess *> Path;
 
 	/* The provider that created this access entry */
@@ -135,7 +135,7 @@ class CoreExport ChanAccess : public Serializable
  */
 class CoreExport AccessGroup
 {
- public:
+public:
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
diff --git a/include/account.h b/include/account.h
index d48b25872..08761e7cc 100644
--- a/include/account.h
+++ b/include/account.h
@@ -33,7 +33,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	Anope::string vhost_ident, vhost_host, vhost_creator;
 	time_t vhost_created;
 
- public:
+public:
 	Anope::string nick;
 	Anope::string last_quit;
 	Anope::string last_realname;
@@ -110,7 +110,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
 	/* Unique identifier for the account. */
 	uint64_t id;
- public:
+public:
 	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
@@ -244,11 +244,11 @@ class CoreExport IdentifyRequest
 
 	static std::set<IdentifyRequest *> Requests;
 
- protected:
+protected:
 	IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass);
 	virtual ~IdentifyRequest();
 
- public:
+public:
 	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;
diff --git a/include/anope.h b/include/anope.h
index 4a2c1074e..a3b17a593 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -24,13 +24,13 @@ namespace Anope
 	 */
 	class CoreExport string
 	{
-	 private:
+	private:
 		/**
 		 * The actual string is stored in an std::string as it can be converted to
 		 * ci::string, or a C-style string at any time.
 		 */
 		std::string _string;
-	 public:
+	public:
 		/**
 		 * Extras.
 		 */
@@ -557,7 +557,7 @@ namespace Anope
  */
 class CoreExport sepstream
 {
- private:
+private:
 	/** Original string.
 	 */
 	Anope::string tokens;
@@ -570,7 +570,7 @@ class CoreExport sepstream
 	/** If set then GetToken() can return an empty string
 	 */
 	bool allow_empty;
- public:
+public:
 	/** Create a sepstream and fill it with the provided data
 	 */
 	sepstream(const Anope::string &source, char separator, bool allowempty = false);
@@ -626,7 +626,7 @@ class CoreExport sepstream
  */
 class commasepstream : public sepstream
 {
- public:
+public:
 	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
@@ -636,7 +636,7 @@ class commasepstream : public sepstream
  */
 class spacesepstream : public sepstream
 {
- public:
+public:
 	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
@@ -650,14 +650,14 @@ class spacesepstream : public sepstream
  */
 class CoreException : public std::exception
 {
- protected:
+protected:
 	/** Holds the error message to be displayed
 	 */
 	Anope::string err;
 	/** Source of the exception
 	 */
 	Anope::string source;
- public:
+public:
 	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
@@ -689,7 +689,7 @@ class CoreException : public std::exception
 
 class ModuleException : public CoreException
 {
- public:
+public:
 	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }
@@ -706,7 +706,7 @@ class ModuleException : public CoreException
 
 class ConvertException : public CoreException
 {
- public:
+public:
 	ConvertException(const Anope::string &reason = "") : CoreException(reason) { }
 
 	virtual ~ConvertException() noexcept = default;
diff --git a/include/base.h b/include/base.h
index a88877bc5..405595cd5 100644
--- a/include/base.h
+++ b/include/base.h
@@ -16,7 +16,7 @@ class CoreExport Base
 {
 	/* References to this base class */
 	std::set<ReferenceBase *> *references = nullptr;
- public:
+public:
 	virtual ~Base();
 
 	/** Adds a reference to this object. Eg, when a Reference
@@ -30,9 +30,9 @@ class CoreExport Base
 
 class ReferenceBase
 {
- protected:
+protected:
 	bool invalid = false;
- public:
+public:
 	ReferenceBase() = default;
 	ReferenceBase(const ReferenceBase &other) : invalid(other.invalid) { }
 	virtual ~ReferenceBase() = default;
@@ -45,9 +45,9 @@ class ReferenceBase
 template<typename T>
 class Reference : public ReferenceBase
 {
- protected:
+protected:
 	T *ref = nullptr;
- public:
+public:
 	Reference() = default;
 
 	Reference(T *obj) : ref(obj)
diff --git a/include/bots.h b/include/bots.h
index 4b2f40ddf..36402c0d3 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -23,7 +23,7 @@ class CoreExport BotInfo : public User, public Serializable
 {
 	/* Channels this bot is assigned to */
 	Serialize::Checker<std::set<ChannelInfo *> > channels;
- public:
+public:
 	time_t created;
 	/* Last time this bot said something (via privmsg) */
 	time_t lastmsg;
diff --git a/include/channels.h b/include/channels.h
index da4ab33a4..a44633204 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -32,14 +32,14 @@ class CoreExport Channel : public Base, public Extensible
 {
 	static std::vector<Channel *> deleting;
 
- public:
+public:
 	typedef std::multimap<Anope::string, Anope::string> ModeList;
- private:
+private:
 	/** A map of channel modes with their parameters set on this channel
 	 */
 	ModeList modes;
 
- public:
+public:
 	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
@@ -73,14 +73,14 @@ class CoreExport Channel : public Base, public Extensible
 	int16_t chanserv_modecount;	/* Number of check_mode()'s this sec */
 	int16_t bouncy_modes;		/* Did we fail to set modes here? */
 
- private:
+private:
 	/** Constructor
 	 * @param name The channel name
 	 * @param ts The time the channel was created
 	 */
 	Channel(const Anope::string &nname, time_t ts = Anope::CurTime);
 
- public:
+public:
 	/** Destructor
 	 */
 	~Channel();
diff --git a/include/commands.h b/include/commands.h
index 451727500..4fe116e1b 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -53,7 +53,7 @@ class CoreExport CommandSource
 	Anope::string nick;
 	/* User executing the command, may be NULL */
 	Reference<User> u;
- public:
+public:
 	/* The account executing the command */
 	Reference<NickCore> nc;
 	/* for web clients */
@@ -97,7 +97,7 @@ class CoreExport Command : public Service
 	/* Command requires that a user is executing it */
 	bool require_user;
 
- public:
+public:
 	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
@@ -106,7 +106,7 @@ class CoreExport Command : public Service
 	/* Module which owns us */
 	Module *module;
 
- protected:
+protected:
 	/** Create a new command.
 	 * @param owner The owner of the command
 	 * @param sname The command name
@@ -116,10 +116,10 @@ class CoreExport Command : public Service
 	 */
 	Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0);
 
- public:
+public:
 	virtual ~Command() = default;
 
- protected:
+protected:
 	void SetDesc(const Anope::string &d);
 
 	void ClearSyntax();
@@ -129,7 +129,7 @@ class CoreExport Command : public Service
 	void AllowUnregistered(bool b);
 	void RequireUser(bool b);
 
- public:
+public:
 	bool AllowUnregistered() const;
 	bool RequireUser() const;
 
diff --git a/include/config.h b/include/config.h
index bcd792adb..b920490d2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -25,11 +25,11 @@ namespace Configuration
 	{
 		friend struct Configuration::Conf;
 
-	 public:
+	public:
 		typedef Anope::map<Anope::string> item_map;
 		typedef Anope::multimap<Block> block_map;
 
-	 private:
+	private:
 		Anope::string name;
 		item_map items;
 		block_map blocks;
@@ -38,7 +38,7 @@ namespace Configuration
 		/* Represents a missing tag. */
 		static Block EmptyBlock;
 
-	 public:
+	public:
 		Block(const Anope::string &);
 		const Anope::string &GetName() const;
 		int CountBlock(const Anope::string &name) const;
@@ -83,7 +83,7 @@ namespace Configuration
 		Anope::string name;
 		bool executable;
 		FILE *fp = nullptr;
-	 public:
+	public:
 		File(const Anope::string &, bool);
 		~File();
 		const Anope::string &GetName() const;
@@ -173,7 +173,7 @@ namespace Configuration
  */
 class ConfigException : public CoreException
 {
- public:
+public:
 	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
diff --git a/include/extensible.h b/include/extensible.h
index 317ea9f64..93fbd9524 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -17,13 +17,13 @@ class Extensible;
 
 class CoreExport ExtensibleBase : public Service
 {
- protected:
+protected:
 	std::map<Extensible *, void *> items;
 
 	ExtensibleBase(Module *m, const Anope::string &n);
 	~ExtensibleBase();
 
- public:
+public:
 	virtual void Unset(Extensible *obj) = 0;
 
 	/* called when an object we are keep track of is serializing */
@@ -33,7 +33,7 @@ class CoreExport ExtensibleBase : public Service
 
 class CoreExport Extensible
 {
- public:
+public:
 	std::set<ExtensibleBase *> extension_items;
 
 	virtual ~Extensible();
@@ -55,10 +55,10 @@ class CoreExport Extensible
 template<typename T>
 class BaseExtensibleItem : public ExtensibleBase
 {
- protected:
+protected:
 	virtual T *Create(Extensible *) = 0;
 
- public:
+public:
 	BaseExtensibleItem(Module *m, const Anope::string &n) : ExtensibleBase(m, n) { }
 
 	~BaseExtensibleItem()
@@ -126,43 +126,43 @@ class BaseExtensibleItem : public ExtensibleBase
 template<typename T>
 class ExtensibleItem : public BaseExtensibleItem<T>
 {
- protected:
+protected:
 	T* Create(Extensible *obj) override
 	{
 		return new T(obj);
 	}
- public:
+public:
 	ExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
 };
 
 template<typename T>
 class PrimitiveExtensibleItem : public BaseExtensibleItem<T>
 {
- protected:
+protected:
 	T* Create(Extensible *obj) override
 	{
 		return new T();
 	}
- public:
+public:
 	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
 };
 
 template<>
 class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool>
 {
- protected:
+protected:
 	bool* Create(Extensible *) override
 	{
 		return NULL;
 	}
- public:
+public:
 	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<bool>(m, n) { }
 };
 
 template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
- public:
+public:
 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
@@ -184,7 +184,7 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
- public:
+public:
 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 930717444..6ceb46a55 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -29,7 +29,7 @@ namespace Anope
 	template<typename char_type>
 	class ascii_ctype : public std::ctype<char_type>
 	{
-	 public:
+	public:
 		char_type do_toupper(char_type c) const override
 		{
 			if (c >= 'a' && c <= 'z')
@@ -51,7 +51,7 @@ namespace Anope
 	template<typename char_type>
 	class rfc1459_ctype : public ascii_ctype<char_type>
 	{
-	 public:
+	public:
 		char_type do_toupper(char_type c) const override
 		{
 			if (c == '{' || c == '}' || c == '|')
diff --git a/include/lists.h b/include/lists.h
index 6e134d7ca..759706f1d 100644
--- a/include/lists.h
+++ b/include/lists.h
@@ -23,13 +23,13 @@
  */
 class CoreExport NumberList
 {
- private:
+private:
 	bool is_valid = true;
 
 	std::set<unsigned> numbers;
 
 	bool desc;
- public:
+public:
 	/** Processes a numbered list
 	 * @param list The list
 	 * @param descending True to make HandleNumber get called with numbers in descending order
@@ -62,13 +62,13 @@ class CoreExport NumberList
  */
 class CoreExport ListFormatter
 {
- public:
+public:
 	typedef std::map<Anope::string, Anope::string> ListEntry;
- private:
+private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
 	std::vector<ListEntry> entries;
- public:
+public:
 	ListFormatter(NickCore *nc);
 	ListFormatter &AddColumn(const Anope::string &name);
 	void AddEntry(const ListEntry &entry);
@@ -83,7 +83,7 @@ class CoreExport InfoFormatter
 	NickCore *nc;
 	std::vector<std::pair<Anope::string, Anope::string> > replies;
 	unsigned longest = 0;
- public:
+public:
 	InfoFormatter(NickCore *nc);
 	void Process(std::vector<Anope::string> &);
 	Anope::string &operator[](const Anope::string &key);
diff --git a/include/logger.h b/include/logger.h
index c23b00666..6c524d487 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -50,7 +50,7 @@ struct LogFile
 /* Represents a single log message */
 class CoreExport Log
 {
- public:
+public:
 	/* Bot that should log this message */
 	BotInfo *bi = nullptr;
 	/* For commands, the user executing the command, but might not always exist */
@@ -94,11 +94,11 @@ class CoreExport Log
 
 	~Log();
 
- private:
+private:
 	Anope::string FormatSource() const;
 	Anope::string FormatCommand() const;
 
- public:
+public:
 	Anope::string BuildPrefix() const;
 
 	template<typename T> Log &operator<<(T val)
@@ -111,7 +111,7 @@ class CoreExport Log
 /* Configured in the configuration file, actually does the message logging */
 class CoreExport LogInfo
 {
- public:
+public:
 	BotInfo *bot = nullptr;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
diff --git a/include/mail.h b/include/mail.h
index e06357825..9c6a32136 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -24,7 +24,7 @@ namespace Mail
 	/* A email message being sent */
 	class Message : public Thread
 	{
-	 private:
+	private:
 		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
@@ -35,7 +35,7 @@ namespace Mail
 		bool dont_quote_addresses;
 
 		bool success = false;
-	 public:
+	public:
 		/** 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)
diff --git a/include/memo.h b/include/memo.h
index e97cc9da0..9a3571e2c 100644
--- a/include/memo.h
+++ b/include/memo.h
@@ -16,7 +16,7 @@
 
 class CoreExport Memo : public Serializable
 {
- public:
+public:
 	MemoInfo *mi;
 	bool unread;
 	bool receipt;
diff --git a/include/modes.h b/include/modes.h
index 3c34a6b31..cd42efcdd 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -37,7 +37,7 @@ enum ModeClass
  */
 class CoreExport Mode : public Base
 {
- public:
+public:
 	/* Mode name */
 	Anope::string name;
 	/* Class of mode this is (user/channel) */
@@ -66,7 +66,7 @@ class CoreExport Mode : public Base
  */
 class CoreExport UserMode : public Mode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -76,7 +76,7 @@ class CoreExport UserMode : public Mode
 
 class CoreExport UserModeParam : public UserMode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -94,7 +94,7 @@ class CoreExport UserModeParam : public UserMode
  */
 class CoreExport ChannelMode : public Mode
 {
- public:
+public:
 	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;
 
@@ -125,7 +125,7 @@ class CoreExport ChannelMode : public Mode
  */
 class CoreExport ChannelModeList : public ChannelMode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -163,7 +163,7 @@ class CoreExport ChannelModeList : public ChannelMode
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {
- public:
+public:
 	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
@@ -185,7 +185,7 @@ class CoreExport ChannelModeParam : public ChannelMode
 */
 class CoreExport ChannelModeStatus : public ChannelMode
 {
- public:
+public:
 	/* The symbol, eg @ % + */
 	char symbol;
 	/* The "level" of the mode, used to compare with other modes.
@@ -211,7 +211,7 @@ class CoreExport ChannelModeVirtual : public T
 	Anope::string base;
 	ChannelMode *basech;
 
- public:
+public:
 	ChannelModeVirtual(const Anope::string &mname, const Anope::string &basename);
 
 	~ChannelModeVirtual();
@@ -227,7 +227,7 @@ class CoreExport ChannelModeVirtual : public T
 class CoreExport ChannelStatus
 {
 	Anope::string modes;
- public:
+public:
 	ChannelStatus() = default;
 	ChannelStatus(const Anope::string &modes);
 	void AddMode(char c);
@@ -241,7 +241,7 @@ class CoreExport ChannelStatus
 
 class CoreExport UserModeOperOnly : public UserMode
 {
- public:
+public:
 	UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
 	bool CanSet(User *u) const override;
@@ -249,7 +249,7 @@ class CoreExport UserModeOperOnly : public UserMode
 
 class CoreExport UserModeNoone : public UserMode
 {
- public:
+public:
 	UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
 	bool CanSet(User *u) const override;
@@ -259,7 +259,7 @@ class CoreExport UserModeNoone : public UserMode
  */
 class CoreExport ChannelModeKey : public ChannelModeParam
 {
- public:
+public:
 	ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { }
 
 	bool IsValid(Anope::string &value) const override;
@@ -269,7 +269,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam
  */
 class CoreExport ChannelModeOperOnly : public ChannelMode
 {
- public:
+public:
 	ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	/* Opers only */
@@ -280,7 +280,7 @@ class CoreExport ChannelModeOperOnly : public ChannelMode
  */
 class CoreExport ChannelModeNoone : public ChannelMode
 {
- public:
+public:
 	ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	bool CanSet(User *u) const override;
@@ -294,7 +294,7 @@ class CoreExport ChannelModeNoone : public ChannelMode
  */
 class CoreExport ModeManager
 {
- public:
+public:
 
 	/* Number of generic channel and user modes we are tracking */
 	static unsigned GenericChannelModes;
@@ -392,7 +392,7 @@ class CoreExport Entry
 {
 	Anope::string name;
 	Anope::string mask;
- public:
+public:
 	unsigned short cidr_len = 0;
 	int family = 0;
 	Anope::string nick, user, host, real;
diff --git a/include/modules.h b/include/modules.h
index 13030bca2..56c29434d 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -172,12 +172,12 @@ struct ModuleVersionC
  */
 class ModuleVersion
 {
- private:
+private:
 	int version_major;
 	int version_minor;
 	int version_patch;
 
- public:
+public:
 	ModuleVersion(const ModuleVersionC &);
 
 	/** Get the major version of Anope this was built against
@@ -202,9 +202,9 @@ class NotImplementedException : public CoreException { };
  */
 class CoreExport Module : public Extensible
 {
- private:
+private:
 	bool permanent;
- public:
+public:
 	/** The module name (e.g. os_modload)
 	 */
 	Anope::string name;
@@ -1112,7 +1112,7 @@ enum Implementation
  */
 class CoreExport ModuleManager
 {
- public:
+public:
 	/** Event handler hooks.
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];
@@ -1195,7 +1195,7 @@ class CoreExport ModuleManager
 	 */
 	static void UnloadAll();
 
- private:
+private:
 	/** Call the module_delete function to safely delete the module
 	 * @param m the module to delete
 	 * @return MOD_ERR_OK on success, anything else on fail
diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h
index ef773269f..86840600d 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/bs_badwords.h
@@ -33,7 +33,7 @@ struct BadWord
 	BadWordType type;
 
 	virtual ~BadWord() = default;
- protected:
+protected:
 	BadWord() = default;
 };
 
diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h
index c296e9221..6d0f4e085 100644
--- a/include/modules/bs_kick.h
+++ b/include/modules/bs_kick.h
@@ -37,10 +37,10 @@ struct KickerData
 
 	bool dontkickops, dontkickvoices;
 
- protected:
+protected:
 	KickerData() = default;
 
- public:
+public:
 	virtual ~KickerData() = default;
 	virtual void Check(ChannelInfo *ci) = 0;
 };
diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h
index e3586d5e9..a99ce6dd9 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/cs_entrymsg.h
@@ -16,16 +16,16 @@ struct EntryMsg
 	time_t when;
 
 	virtual ~EntryMsg() = default;
- protected:
+protected:
 	EntryMsg() = default;
 };
 
 struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
 {
- protected:
+protected:
 	EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { }
 
- public:
+public:
 	virtual ~EntryMessageList()
 	{
 		for (unsigned i = (*this)->size(); i > 0; --i)
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index e283beabb..d88bd30c6 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -25,7 +25,7 @@ struct LogSetting
 	time_t created;
 
 	virtual ~LogSetting() = default;
- protected:
+protected:
 	LogSetting() = default;
 };
 
@@ -33,12 +33,12 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 {
 	typedef std::vector<LogSetting *>::iterator iterator;
 
- protected:
+protected:
 	LogSettings() : Serialize::Checker<std::vector<LogSetting *> >("LogSetting")
 	{
 	}
 
- public:
+public:
 	virtual ~LogSettings() = default;
 	virtual LogSetting *Create() = 0;
 };
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index e62042d04..a4fed83f5 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -21,7 +21,7 @@ struct ModeLock
 	time_t created;
 
 	virtual ~ModeLock() = default;
- protected:
+protected:
 	ModeLock() = default;
 };
 
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 1c5941588..4d733d3fc 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -115,7 +115,7 @@ namespace DNS
 	 */
 	class Manager : public Service
 	{
-	 public:
+	public:
 		Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
 		virtual ~Manager() = default;
 
@@ -134,7 +134,7 @@ namespace DNS
 	class Request : public Timer, public Question
 	{
 		Manager *manager;
-	 public:
+	public:
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index 70bf6fb08..1475e8ab4 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -18,7 +18,7 @@ namespace Encryption
 
 	class Context
 	{
-	 public:
+	public:
 		virtual ~Context() = default;
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
@@ -27,7 +27,7 @@ namespace Encryption
 
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
 		virtual ~Provider() = default;
 
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 207499d3b..b84cb728f 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -98,7 +98,7 @@ class HTTPPage : public virtual Base
 	Anope::string url;
 	Anope::string content_type;
 
- public:
+public:
 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
 
 	const Anope::string &GetURL() const { return this->url; }
@@ -117,13 +117,13 @@ class HTTPPage : public virtual Base
 
 class HTTPClient : public ClientSocket, public BinarySocket, public Base
 {
- protected:
+protected:
 	void WriteClient(const Anope::string &message)
 	{
 		BinarySocket::Write(message + "\r\n");
 	}
 
- public:
+public:
 	HTTPClient(ListenSocket *l, int f, const sockaddrs &a) : ClientSocket(l, a), BinarySocket() { }
 
 	virtual const Anope::string GetIP()
@@ -140,7 +140,7 @@ class HTTPProvider : public ListenSocket, public Service
 	Anope::string ip;
 	unsigned short port;
 	bool ssl;
- public:
+public:
 	std::vector<Anope::string> ext_ips;
 	std::vector<Anope::string> ext_headers;
 
diff --git a/include/modules/ldap.h b/include/modules/ldap.h
index 34f73f65b..3769b0ccb 100644
--- a/include/modules/ldap.h
+++ b/include/modules/ldap.h
@@ -10,7 +10,7 @@
 
 class LDAPException : public ModuleException
 {
- public:
+public:
 	LDAPException(const Anope::string &reason) : ModuleException(reason) { }
 
 	virtual ~LDAPException() noexcept = default;
@@ -111,7 +111,7 @@ struct LDAPResult
 
 class LDAPInterface
 {
- public:
+public:
 	Module *owner;
 
 	LDAPInterface(Module *m) : owner(m) { }
@@ -124,7 +124,7 @@ class LDAPInterface
 
 class LDAPProvider : public Service
 {
- public:
+public:
 	LDAPProvider(Module *c, const Anope::string &n) : Service(c, "LDAPProvider", n) { }
 
 	/** Attempt to bind to the LDAP server as an admin
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index 824964ba8..b22d22a7c 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -13,9 +13,9 @@
 
 struct NSCertList
 {
- protected:
+protected:
 	NSCertList() = default;
- public:
+public:
 	virtual ~NSCertList() = default;
 
 	/** Add an entry to the nick's certificate list
@@ -65,7 +65,7 @@ struct NSCertList
 
 class CertService : public Service
 {
- public:
+public:
 	CertService(Module *c) : Service(c, "CertService", "certs") { }
 
 	virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0;
diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h
index 35dfc5c7f..354e54453 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/os_forbid.h
@@ -27,13 +27,13 @@ struct ForbidData
 	ForbidType type;
 
 	virtual ~ForbidData() = default;
- protected:
+protected:
 	ForbidData() = default;
 };
 
 class ForbidService : public Service
 {
- public:
+public:
 	ForbidService(Module *m) : Service(m, "ForbidService", "forbid") { }
 
 	virtual void AddForbid(ForbidData *d) = 0;
diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h
index 14b71f9ac..fdc89ff7b 100644
--- a/include/modules/os_ignore.h
+++ b/include/modules/os_ignore.h
@@ -19,16 +19,16 @@ struct IgnoreData
 	time_t time = 0; /* When do we stop ignoring them? */
 
 	virtual ~IgnoreData() = default;
- protected:
+protected:
 	IgnoreData() = default;
 };
 
 class IgnoreService : public Service
 {
- protected:
+protected:
 	IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
 
- public:
+public:
 	virtual void AddIgnore(IgnoreData *) = 0;
 
 	virtual void DelIgnore(IgnoreData *) = 0;
diff --git a/include/modules/os_news.h b/include/modules/os_news.h
index 10228e82a..9add8b210 100644
--- a/include/modules/os_news.h
+++ b/include/modules/os_news.h
@@ -34,7 +34,7 @@ struct NewsItem : Serializable
 
 class NewsService : public Service
 {
- public:
+public:
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
 
 	virtual NewsItem *CreateNewsItem() = 0;
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index eb8c2aaca..48799e574 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -33,7 +33,7 @@ struct Exception : Serializable
 
 class SessionService : public Service
 {
- public:
+public:
 	typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
diff --git a/include/modules/pseudoclients/chanserv.h b/include/modules/pseudoclients/chanserv.h
index 013596ed9..0cc327155 100644
--- a/include/modules/pseudoclients/chanserv.h
+++ b/include/modules/pseudoclients/chanserv.h
@@ -10,7 +10,7 @@
 
 class ChanServService : public Service
 {
- public:
+public:
 	ChanServService(Module *m) : Service(m, "ChanServService", "ChanServ")
 	{
 	}
diff --git a/include/modules/pseudoclients/global.h b/include/modules/pseudoclients/global.h
index b27ad3562..f88218769 100644
--- a/include/modules/pseudoclients/global.h
+++ b/include/modules/pseudoclients/global.h
@@ -10,7 +10,7 @@
 
 class GlobalService : public Service
 {
- public:
+public:
 	GlobalService(Module *m) : Service(m, "GlobalService", "Global")
 	{
 	}
diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h
index ea3fc964e..e5119d54a 100644
--- a/include/modules/pseudoclients/memoserv.h
+++ b/include/modules/pseudoclients/memoserv.h
@@ -10,7 +10,7 @@
 
 class MemoServService : public Service
 {
- public:
+public:
 	enum MemoResult
 	{
 		MEMO_SUCCESS,
diff --git a/include/modules/pseudoclients/nickserv.h b/include/modules/pseudoclients/nickserv.h
index 5207d7021..e037db167 100644
--- a/include/modules/pseudoclients/nickserv.h
+++ b/include/modules/pseudoclients/nickserv.h
@@ -10,7 +10,7 @@
 
 class NickServService : public Service
 {
- public:
+public:
 	NickServService(Module *m) : Service(m, "NickServService", "NickServ")
 	{
 	}
diff --git a/include/modules/redis.h b/include/modules/redis.h
index f30311f34..517d12701 100644
--- a/include/modules/redis.h
+++ b/include/modules/redis.h
@@ -45,7 +45,7 @@ namespace Redis
 
 	class Interface
 	{
-	 public:
+	public:
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
@@ -57,7 +57,7 @@ namespace Redis
 
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
 
 		virtual bool IsSocketDead() = 0;
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index f5482d31b..b8d3c07cb 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -24,7 +24,7 @@ namespace SASL
 
 	class Service : public ::Service
 	{
-	 public:
+	public:
 		Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
 
 		virtual void ProcessMessage(const Message &) = 0;
@@ -62,7 +62,7 @@ namespace SASL
 	/* PLAIN, EXTERNAL, etc */
 	class Mechanism : public ::Service
 	{
-	 public:
+	public:
 		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
 
 		virtual Session* CreateSession(const Anope::string &uid) { return new Session(this, uid); }
@@ -81,7 +81,7 @@ namespace SASL
 		Anope::string uid;
 		Anope::string hostname, ip;
 
-	 public:
+	public:
 		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { }
 
 		void OnSuccess() override
diff --git a/include/modules/set_misc.h b/include/modules/set_misc.h
index 892972d6d..43a06237d 100644
--- a/include/modules/set_misc.h
+++ b/include/modules/set_misc.h
@@ -15,6 +15,6 @@ struct MiscData
 	Anope::string data;
 
 	virtual ~MiscData() = default;
- protected:
+protected:
 	MiscData() = default;
 };
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 607f8bcd9..ec21c7b9f 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -13,7 +13,7 @@ namespace SQL
 
 	class Data : public Serialize::Data
 	{
-	 public:
+	public:
 		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;
@@ -83,7 +83,7 @@ namespace SQL
 	 */
 	class Exception : public ModuleException
 	{
-	 public:
+	public:
 		Exception(const Anope::string &reason) : ModuleException(reason) { }
 
 		virtual ~Exception() noexcept = default;
@@ -139,12 +139,12 @@ namespace SQL
 	 */
 	class Result
 	{
-	 protected:
+	protected:
 		/* Rows, column, item */
 		std::vector<std::map<Anope::string, Anope::string> > entries;
 		Query query;
 		Anope::string error;
-	 public:
+	public:
 		unsigned int id = 0;
 		Anope::string finished_query;
 
@@ -187,7 +187,7 @@ namespace SQL
 	 */
 	class Interface
 	{
-	 public:
+	public:
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
@@ -201,7 +201,7 @@ namespace SQL
 	 */
 	class Provider : public Service
 	{
-	 public:
+	public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "SQL::Provider", n) { }
 
 		virtual void Run(Interface *i, const Query &query) = 0;
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 4d1fa63e4..ba391178a 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -10,7 +10,7 @@
 
 class SSLService : public Service
 {
- public:
+public:
 	SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { }
 
 	virtual void Init(Socket *s) = 0;
diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h
index 81d8b3f7e..92ac1fb7e 100644
--- a/include/modules/xmlrpc.h
+++ b/include/modules/xmlrpc.h
@@ -14,7 +14,7 @@ class XMLRPCRequest
 {
 	std::map<Anope::string, Anope::string> replies;
 
- public:
+public:
 	Anope::string name;
 	Anope::string id;
 	std::deque<Anope::string> data;
@@ -29,14 +29,14 @@ class XMLRPCServiceInterface;
 
 class XMLRPCEvent
 {
- public:
+public:
 	virtual ~XMLRPCEvent() = default;
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
 class XMLRPCServiceInterface : public Service
 {
- public:
+public:
 	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { }
 
 	virtual void Register(XMLRPCEvent *event) = 0;
diff --git a/include/opertype.h b/include/opertype.h
index 628180cbb..12052815d 100644
--- a/include/opertype.h
+++ b/include/opertype.h
@@ -42,7 +42,7 @@ struct CoreExport Oper
 
 class CoreExport OperType
 {
- private:
+private:
 	/** The name of this opertype, e.g. "sra".
 	 */
 	Anope::string name;
@@ -65,7 +65,7 @@ class CoreExport OperType
 	/** Set of opertypes we inherit from
 	 */
 	std::set<OperType *> inheritances;
- public:
+public:
 	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;
diff --git a/include/protocol.h b/include/protocol.h
index 9967012c0..58f3d90e1 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -21,9 +21,9 @@ class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;
 
- protected:
+protected:
 	IRCDProto(Module *creator, const Anope::string &proto_name);
- public:
+public:
 	virtual ~IRCDProto();
 
 	virtual void SendSVSKillInternal(const MessageSource &, User *, const Anope::string &);
@@ -250,7 +250,7 @@ class CoreExport MessageSource
 	User *u = nullptr;
 	Server *s = nullptr;
 
- public:
+public:
 	MessageSource(const Anope::string &);
 	MessageSource(User *u);
 	MessageSource(Server *s);
@@ -273,7 +273,7 @@ class CoreExport IRCDMessage : public Service
 	Anope::string name;
 	unsigned param_count;
 	std::set<IRCDMessageFlag> flags;
- public:
+public:
 	IRCDMessage(Module *owner, const Anope::string &n, unsigned p = 0);
 	unsigned GetParamCount() const;
 	virtual void Run(MessageSource &, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) = 0;
@@ -292,7 +292,7 @@ private:
 	/** The current position within the message. */
 	Anope::string::size_type position = 0;
 
- public:
+public:
 	/** Create a tokenstream and fill it with the provided data. */
 	MessageTokenizer(const Anope::string &msg);
 
diff --git a/include/regchannel.h b/include/regchannel.h
index ef49d0913..74dcd2e65 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -23,7 +23,7 @@ extern CoreExport Serialize::Checker<registered_channel_map> RegisteredChannelLi
 /* AutoKick data. */
 class CoreExport AutoKick : public Serializable
 {
- public:
+public:
 	/* Channel this autokick is on */
 	Serialize::Reference<ChannelInfo> ci;
 
@@ -47,14 +47,14 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 {
 	/* channels who reference this one */
 	Anope::map<int> references;
- private:
+private:
 	Serialize::Reference<NickCore> founder;					/* Channel founder */
 	Serialize::Reference<NickCore> successor;                               /* Who gets the channel if the founder nick is dropped or expires */
 	Serialize::Checker<std::vector<ChanAccess *> > access;			/* List of authorized users */
 	Serialize::Checker<std::vector<AutoKick *> > akick;			/* List of users to kickban */
 	Anope::map<int16_t> levels;
 
- public:
+public:
 	friend class ChanAccess;
 	friend class AutoKick;
 
diff --git a/include/regexpr.h b/include/regexpr.h
index 7ddfa9a55..9000e5119 100644
--- a/include/regexpr.h
+++ b/include/regexpr.h
@@ -17,7 +17,7 @@
 
 class RegexException : public CoreException
 {
- public:
+public:
 	RegexException(const Anope::string &reason = "") : CoreException(reason) { }
 
 	virtual ~RegexException() noexcept = default;
@@ -26,9 +26,9 @@ class RegexException : public CoreException
 class CoreExport Regex
 {
 	Anope::string expression;
- protected:
+protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
- public:
+public:
 	virtual ~Regex() = default;
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
@@ -36,7 +36,7 @@ class CoreExport Regex
 
 class CoreExport RegexProvider : public Service
 {
- public:
+public:
 	RegexProvider(Module *o, const Anope::string &n) : Service(o, "Regex", n) { }
 	virtual Regex *Compile(const Anope::string &) = 0;
 };
diff --git a/include/serialize.h b/include/serialize.h
index 1cb4bdce5..3510858f0 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -20,7 +20,7 @@ namespace Serialize
 {
 	class Data
 	{
-	 public:
+	public:
 		enum Type
 		{
 			DT_TEXT,
@@ -51,7 +51,7 @@ namespace Serialize
  */
 class CoreExport Serializable : public virtual Base
 {
- private:
+private:
 	/* A list of every serializable item in Anope.
 	 * Some of these are static and constructed at runtime,
 	 * so this list must be on the heap, as it is not always
@@ -68,13 +68,13 @@ class CoreExport Serializable : public virtual Base
 	/* The last time this object was committed to the database */
 	time_t last_commit_time = 0;
 
- protected:
+protected:
 	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);
 
 	Serializable &operator=(const Serializable &);
 
- public:
+public:
 	virtual ~Serializable();
 
 	/* Unique ID (per type, not globally) for this object */
@@ -128,7 +128,7 @@ class CoreExport Serialize::Type : public Base
 	 */
 	time_t timestamp = 0;
 
- public:
+public:
 	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;
 
@@ -196,7 +196,7 @@ class Serialize::Checker
 			type->Check();
 	}
 
- public:
+public:
 	Checker(const Anope::string &n) : name(n) { }
 
 	inline const T* operator->() const
@@ -242,10 +242,10 @@ class Serialize::Checker
 template<typename T>
 class Serialize::Reference : public ReferenceBase
 {
- protected:
+protected:
 	T *ref = nullptr;
 
- public:
+public:
 	Reference() = default;
 
 	Reference(T *obj) : ref(obj)
diff --git a/include/servers.h b/include/servers.h
index 442b54f25..b7ce2c7c6 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -39,7 +39,7 @@ namespace Servers
  */
 class CoreExport Server : public Extensible
 {
- private:
+private:
 	/* Server name */
 	Anope::string name;
 	/* Hops between services and server */
@@ -61,7 +61,7 @@ class CoreExport Server : public Extensible
 	/* Reason this server was quit */
 	Anope::string quit_reason;
 
- public:
+public:
 	/** Constructor
 	 * @param uplink The uplink this server is from, is only NULL when creating Me
 	 * @param name The server name
@@ -72,12 +72,12 @@ class CoreExport Server : public Extensible
 	 */
 	Server(Server *uplink, const Anope::string &name, unsigned hops, const Anope::string &description, const Anope::string &sid = "", bool jupe = false);
 
- private:
+private:
 	/** Destructor
 	 */
 	~Server();
 
- public:
+public:
 	/* Number of users on the server */
 	unsigned users = 0;
 
diff --git a/include/service.h b/include/service.h
index fd4163675..a0552ecf3 100644
--- a/include/service.h
+++ b/include/service.h
@@ -41,7 +41,7 @@ class CoreExport Service : public virtual Base
 		return NULL;
 	}
 
- public:
+public:
 	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);
@@ -120,7 +120,7 @@ class ServiceReference : public Reference<T>
 	Anope::string type;
 	Anope::string name;
 
- public:
+public:
 	ServiceReference() = default;
 
 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
@@ -161,7 +161,7 @@ class ServiceReference : public Reference<T>
 class ServiceAlias
 {
 	Anope::string t, f;
- public:
+public:
 	ServiceAlias(const Anope::string &type, const Anope::string &from, const Anope::string &to) : t(type), f(from)
 	{
 		Service::AddAlias(type, from, to);
diff --git a/include/socketengine.h b/include/socketengine.h
index 6084aa522..4c9ad608e 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -17,7 +17,7 @@
 class CoreExport SocketEngine
 {
 	static const int DefaultSize = 2; // Uplink, mode stacker
- public:
+public:
 	/* Map of sockets */
 	static std::map<int, Socket *> Sockets;
 
diff --git a/include/sockets.h b/include/sockets.h
index 63df8c7b3..a10e7addd 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -108,7 +108,7 @@ class CoreExport cidr
 	sockaddrs addr;
 	Anope::string cidr_ip;
 	unsigned short cidr_len;
- public:
+public:
 	cidr(const Anope::string &ip);
 	cidr(const Anope::string &ip, unsigned char len);
 	cidr(const sockaddrs &ip, unsigned char len);
@@ -128,7 +128,7 @@ class CoreExport cidr
 
 class SocketException : public CoreException
 {
- public:
+public:
 	/** Constructor for socket exceptions
 	 * @param message Error message
 	 */
@@ -154,7 +154,7 @@ enum SocketFlag
 
 class CoreExport SocketIO
 {
- public:
+public:
 	virtual ~SocketIO() = default;
 
 	/** Receive something from the buffer
@@ -212,14 +212,14 @@ class CoreExport SocketIO
 
 class CoreExport Socket
 {
- protected:
+protected:
 	/* Socket FD */
 	int sock;
 
 	/* The family of this socket FD */
 	int family;
 
- public:
+public:
 	std::bitset<SF_SIZE> flags;
 
 	/* Sockaddrs for bind() (if it's bound) */
@@ -288,7 +288,7 @@ class CoreExport Socket
 
 class CoreExport BufferedSocket : public virtual Socket
 {
- protected:
+protected:
 	/* Things read from the socket */
 	Anope::string read_buffer;
 	/* Things to be written to the socket */
@@ -296,7 +296,7 @@ class CoreExport BufferedSocket : public virtual Socket
 	/* How much data was received from this socket on this recv() */
 	int recv_len;
 
- public:
+public:
 	virtual ~BufferedSocket() = default;
 
 	/** Called when there is something to be received for this socket
@@ -316,9 +316,9 @@ class CoreExport BufferedSocket : public virtual Socket
 	/** Write to the socket
 	* @param message The message
 	*/
- protected:
+protected:
 	virtual void Write(const char *buffer, size_t l);
- public:
+public:
 	void Write(const char *message, ...);
 	void Write(const Anope::string &message);
 
@@ -335,7 +335,7 @@ class CoreExport BufferedSocket : public virtual Socket
 
 class CoreExport BinarySocket : public virtual Socket
 {
- protected:
+protected:
 	struct DataBlock
 	{
 		char *orig;
@@ -349,7 +349,7 @@ class CoreExport BinarySocket : public virtual Socket
 	/* Data to be written out */
 	std::deque<DataBlock *> write_buffer;
 
- public:
+public:
 	virtual ~BinarySocket() = default;
 
 	/** Called when there is something to be received for this socket
@@ -380,7 +380,7 @@ class CoreExport BinarySocket : public virtual Socket
 
 class CoreExport ListenSocket : public virtual Socket
 {
- public:
+public:
 	/** Constructor
 	 * @param bindip The IP to bind to
 	 * @param port The port to listen on
@@ -404,7 +404,7 @@ class CoreExport ListenSocket : public virtual Socket
 
 class CoreExport ConnectionSocket : public virtual Socket
 {
- public:
+public:
 	/* Sockaddrs for connection ip/port */
 	sockaddrs conaddr;
 
@@ -437,7 +437,7 @@ class CoreExport ConnectionSocket : public virtual Socket
 
 class CoreExport ClientSocket : public virtual Socket
 {
- public:
+public:
 	/* Listen socket this connection came from */
 	ListenSocket *ls;
 	/* Clients address */
@@ -471,7 +471,7 @@ class CoreExport ClientSocket : public virtual Socket
 
 class CoreExport Pipe : public Socket
 {
- public:
+public:
 	/** The FD of the write pipe
 	 * this->sock is the readfd
 	 */
diff --git a/include/threadengine.h b/include/threadengine.h
index 7d7c2dc70..7e59cc117 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -16,11 +16,11 @@
 
 class CoreExport Thread : public Pipe, public Extensible
 {
- private:
+private:
 	/* Set to true to tell the thread to finish and we are waiting for it */
 	bool exit = false;
 
- public:
+public:
 	/* Handle for this thread */
 	pthread_t handle;
 
@@ -60,11 +60,11 @@ class CoreExport Thread : public Pipe, public Extensible
 
 class CoreExport Mutex
 {
- protected:
+protected:
 	/* A mutex, used to keep threads in sync */
 	pthread_mutex_t mutex;
 
- public:
+public:
 	/** Constructor
 	 */
 	Mutex();
@@ -90,11 +90,11 @@ class CoreExport Mutex
 
 class CoreExport Condition : public Mutex
 {
- private:
+private:
 	/* A condition */
 	pthread_cond_t cond;
 
- public:
+public:
 	/** Constructor
 	 */
 	Condition();
diff --git a/include/timers.h b/include/timers.h
index d3a5b9532..46f82c60a 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -15,7 +15,7 @@
 
 class CoreExport Timer
 {
- private:
+private:
 	/** The owner of the timer, if any
 	 */
 	Module *owner;
@@ -36,7 +36,7 @@ class CoreExport Timer
 	 */
 	bool repeat;
 
- public:
+public:
 	/** Constructor, initializes the triggering time
 	 * @param time_from_now The number of seconds from now to trigger the timer
 	 * @param now The time now
@@ -106,7 +106,7 @@ class CoreExport TimerManager
 	/** A list of timers
 	 */
 	static std::multimap<time_t, Timer *> Timers;
- public:
+public:
 	/** Add a timer to the list
 	 * @param t A Timer derived class to add
 	 */
diff --git a/include/uplink.h b/include/uplink.h
index c14c5fda8..a013de39a 100644
--- a/include/uplink.h
+++ b/include/uplink.h
@@ -22,7 +22,7 @@ namespace Uplink
 /* This is the socket to our uplink */
 class UplinkSocket : public ConnectionSocket, public BufferedSocket
 {
- public:
+public:
 	bool error;
 	UplinkSocket();
 	~UplinkSocket();
@@ -36,7 +36,7 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 		MessageSource source;
 		std::stringstream buffer;
 
-	 public:
+	public:
 		Message();
 		Message(const MessageSource &);
 		~Message();
diff --git a/include/users.h b/include/users.h
index 6e94e24f0..46d58a1b3 100644
--- a/include/users.h
+++ b/include/users.h
@@ -35,9 +35,9 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/* Users that are in the process of quitting */
 	static std::list<User *> quitting_users;
 
- public:
+public:
 	typedef std::map<Anope::string, Anope::string> ModeList;
- protected:
+protected:
 	Anope::string vident;
 	Anope::string ident;
 	Anope::string uid;
@@ -54,7 +54,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	time_t invalid_pw_time;
 
 
- public: // XXX: exposing a tiny bit too much
+public: // XXX: exposing a tiny bit too much
 	/* User's current nick */
 	Anope::string nick;
 
@@ -90,7 +90,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/* Last time this user sent an email */
 	time_t lastmail;
 
- protected:
+protected:
 	/** Create a new user object, initialising necessary fields and
 	 * adds it to the hash
 	 *
@@ -112,7 +112,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	 */
 	virtual ~User();
 
- public:
+public:
 	static User* OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
 
 	/** Update the nickname of a user record accordingly, should be
diff --git a/include/xline.h b/include/xline.h
index 951f74563..b42e23ad6 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -17,7 +17,7 @@ class CoreExport XLine : public Serializable
 {
 	void Init();
 	Anope::string nick, user, host, real;
- public:
+public:
 	cidr *c;
 	Anope::string mask;
 	Regex *regex;
@@ -55,7 +55,7 @@ class CoreExport XLineManager : public Service
 	Serialize::Checker<std::vector<XLine *> > xlines;
 	/* Akills can have the same IDs, sometimes */
 	static Serialize::Checker<std::multimap<Anope::string, XLine *, ci::less> > XLinesByUID;
- public:
+public:
 	/* List of XLine managers we check users against in XLineManager::CheckAll */
 	static std::list<XLineManager *> XLineManagers;
 
diff --git a/modules/bs_autoassign.cpp b/modules/bs_autoassign.cpp
index 27215e56b..d50f2827d 100644
--- a/modules/bs_autoassign.cpp
+++ b/modules/bs_autoassign.cpp
@@ -11,7 +11,7 @@
 
 class BSAutoAssign : public Module
 {
- public:
+public:
 	BSAutoAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
 	{
 	}
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 53d616e33..8b9a1e47e 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSAssign : public Command
 {
- public:
+public:
 	CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2)
 	{
 		this->SetDesc(_("Assigns a bot to a channel"));
@@ -84,7 +84,7 @@ class CommandBSAssign : public Command
 
 class CommandBSUnassign : public Command
 {
- public:
+public:
 	CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1)
 	{
 		this->SetDesc(_("Unassigns a bot from a channel"));
@@ -147,7 +147,7 @@ class CommandBSUnassign : public Command
 
 class CommandBSSetNoBot : public Command
 {
- public:
+public:
 	CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Prevent a bot from being assigned to a channel"));
@@ -210,7 +210,7 @@ class BSAssign : public Module
 	CommandBSUnassign commandbsunassign;
 	CommandBSSetNoBot commandbssetnobot;
 
- public:
+public:
 	BSAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		nobot(this, "BS_NOBOT"),
 		commandbsassign(this), commandbsunassign(this), commandbssetnobot(this)
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index 72e8c60f3..0d8f46613 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -152,7 +152,7 @@ class BadwordsDelCallback : public NumberList
 	Command *c;
 	unsigned deleted = 0;
 	bool override = false;
- public:
+public:
 	BadwordsDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), source(_source), ci(_ci), c(_c)
 	{
 		if (!source.AccessFor(ci).HasPriv("BADWORDS") && source.HasPriv("botserv/administration"))
@@ -183,7 +183,7 @@ class BadwordsDelCallback : public NumberList
 
 class CommandBSBadwords : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source, ChannelInfo *ci, const Anope::string &word)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
@@ -204,7 +204,7 @@ class CommandBSBadwords : public Command
 			{
 				ListFormatter &list;
 				BadWords *bw;
-			 public:
+			public:
 				BadwordsListCallback(ListFormatter &_list, BadWords *_bw, const Anope::string &numlist) : NumberList(numlist, false), list(_list), bw(_bw)
 				{
 				}
@@ -364,7 +364,7 @@ class CommandBSBadwords : public Command
 		source.Reply(_("Bad words list is now empty."));
 	}
 
- public:
+public:
 	CommandBSBadwords(Module *creator) : Command(creator, "botserv/badwords", 2, 3)
 	{
 		this->SetDesc(_("Maintains the bad words list"));
@@ -459,7 +459,7 @@ class BSBadwords : public Module
 	ExtensibleItem<BadWordsImpl> badwords;
 	Serialize::Type badword_type;
 
- public:
+public:
 	BSBadwords(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbadwords(this), badwords(this, "badwords"), badword_type("BadWord", BadWordImpl::Unserialize)
 	{
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index ee44437dd..f7e6b107d 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSBot : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
 	{
 		const Anope::string &nick = params[1];
@@ -263,7 +263,7 @@ class CommandBSBot : public Command
 		delete bi;
 		return;
 	}
- public:
+public:
 	CommandBSBot(Module *creator) : Command(creator, "botserv/bot", 1, 6)
 	{
 		this->SetDesc(_("Maintains network bot list"));
@@ -374,7 +374,7 @@ class BSBot : public Module
 {
 	CommandBSBot commandbsbot;
 
- public:
+public:
 	BSBot(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbot(this)
 	{
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index b124aa2ce..f2dc371d4 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSBotList : public Command
 {
- public:
+public:
 	CommandBSBotList(Module *creator) : Command(creator, "botserv/botlist", 0, 0)
 	{
 		this->SetDesc(_("Lists available bots"));
@@ -69,7 +69,7 @@ class BSBotList : public Module
 {
 	CommandBSBotList commandbsbotlist;
 
- public:
+public:
 	BSBotList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsbotlist(this)
 	{
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index 8bb93327b..998415acd 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSSay : public Command
 {
- public:
+public:
 	CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
 	{
 		this->SetDesc(_("Makes the bot say the specified text on the specified channel"));
@@ -73,7 +73,7 @@ class CommandBSSay : public Command
 
 class CommandBSAct : public Command
 {
- public:
+public:
 	CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2)
 	{
 		this->SetDesc(_("Makes the bot do the equivalent of a \"/me\" command"));
@@ -135,7 +135,7 @@ class BSControl : public Module
 	CommandBSSay commandbssay;
 	CommandBSAct commandbsact;
 
- public:
+public:
 	BSControl(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbssay(this), commandbsact(this)
 	{
diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp
index d9b3afe1d..51da5f173 100644
--- a/modules/commands/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSInfo : public Command
 {
- private:
+private:
 	void send_bot_channels(std::vector<Anope::string> &buffers, const BotInfo *bi)
 	{
 		Anope::string buf;
@@ -33,7 +33,7 @@ class CommandBSInfo : public Command
 			buffers.push_back(buf);
 	}
 
- public:
+public:
 	CommandBSInfo(Module *creator) : Command(creator, "botserv/info", 1, 1)
 	{
 		this->SetSyntax(_("{\037channel\037 | \037nickname\037}"));
@@ -121,7 +121,7 @@ class BSInfo : public Module
 {
 	CommandBSInfo commandbsinfo;
 
- public:
+public:
 	BSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsinfo(this)
 	{
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 051400d16..eb890011d 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -117,7 +117,7 @@ struct KickerDataImpl : KickerData
 
 class CommandBSKick : public Command
 {
- public:
+public:
 	CommandBSKick(Module *creator) : Command(creator, "botserv/kick", 0)
 	{
 		this->SetDesc(_("Configures kickers"));
@@ -161,7 +161,7 @@ class CommandBSKick : public Command
 
 class CommandBSKickBase : public Command
 {
- public:
+public:
 	CommandBSKickBase(Module *creator, const Anope::string &cname, int minarg, int maxarg) : Command(creator, cname, minarg, maxarg)
 	{
 	}
@@ -170,7 +170,7 @@ class CommandBSKickBase : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0;
 
- protected:
+protected:
 	bool CheckArguments(CommandSource &source, const std::vector<Anope::string> &params, ChannelInfo* &ci)
 	{
 		const Anope::string &chan = params[0];
@@ -246,7 +246,7 @@ class CommandBSKickBase : public Command
 
 class CommandBSKickAMSG : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickAMSG(Module *creator) : CommandBSKickBase(creator, "botserv/kick/amsg", 2, 3)
 	{
 		this->SetDesc(_("Configures AMSG kicker"));
@@ -282,7 +282,7 @@ class CommandBSKickAMSG : public CommandBSKickBase
 
 class CommandBSKickBadwords : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickBadwords(Module *creator) : CommandBSKickBase(creator, "botserv/kick/badwords", 2, 3)
 	{
 		this->SetDesc(_("Configures badwords kicker"));
@@ -321,7 +321,7 @@ class CommandBSKickBadwords : public CommandBSKickBase
 
 class CommandBSKickBolds : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickBolds(Module *creator) : CommandBSKickBase(creator, "botserv/kick/bolds", 2, 3)
 	{
 		this->SetDesc(_("Configures bolds kicker"));
@@ -355,7 +355,7 @@ class CommandBSKickBolds : public CommandBSKickBase
 
 class CommandBSKickCaps : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickCaps(Module *creator) : CommandBSKickBase(creator, "botserv/kick/caps", 2, 5)
 	{
 		this->SetDesc(_("Configures caps kicker"));
@@ -451,7 +451,7 @@ class CommandBSKickCaps : public CommandBSKickBase
 
 class CommandBSKickColors : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickColors(Module *creator) : CommandBSKickBase(creator, "botserv/kick/colors", 2, 3)
 	{
 		this->SetDesc(_("Configures color kicker"));
@@ -485,7 +485,7 @@ class CommandBSKickColors : public CommandBSKickBase
 
 class CommandBSKickFlood : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickFlood(Module *creator) : CommandBSKickBase(creator, "botserv/kick/flood", 2, 5)
 	{
 		this->SetDesc(_("Configures flood kicker"));
@@ -583,7 +583,7 @@ class CommandBSKickFlood : public CommandBSKickBase
 
 class CommandBSKickItalics : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickItalics(Module *creator) : CommandBSKickBase(creator, "botserv/kick/italics", 2, 3)
 	{
 		this->SetDesc(_("Configures italics kicker"));
@@ -617,7 +617,7 @@ class CommandBSKickItalics : public CommandBSKickBase
 
 class CommandBSKickRepeat : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickRepeat(Module *creator) : CommandBSKickBase(creator, "botserv/kick/repeat", 2, 4)
 	{
 		this->SetDesc(_("Configures repeat kicker"));
@@ -718,7 +718,7 @@ class CommandBSKickRepeat : public CommandBSKickBase
 
 class CommandBSKickReverses : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3)
 	{
 		this->SetDesc(_("Configures reverses kicker"));
@@ -752,7 +752,7 @@ class CommandBSKickReverses : public CommandBSKickBase
 
 class CommandBSKickUnderlines : public CommandBSKickBase
 {
- public:
+public:
 	CommandBSKickUnderlines(Module *creator) : CommandBSKickBase(creator, "botserv/kick/underlines", 2, 3)
 	{
 		this->SetDesc(_("Configures underlines kicker"));
@@ -786,7 +786,7 @@ class CommandBSKickUnderlines : public CommandBSKickBase
 
 class CommandBSSetDontKickOps : public Command
 {
- public:
+public:
 	CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("To protect ops against bot kicks"));
@@ -851,7 +851,7 @@ class CommandBSSetDontKickOps : public Command
 
 class CommandBSSetDontKickVoices : public Command
 {
- public:
+public:
 	CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("To protect voices against bot kicks"));
@@ -930,11 +930,11 @@ struct BanData
 		}
 	};
 
- private:
+private:
 	typedef Anope::map<Data> data_type;
 	data_type data_map;
 
- public:
+public:
 	BanData(Extensible *) { }
 
 	Data &get(const Anope::string &key)
@@ -987,7 +987,7 @@ struct UserData
 
 class BanDataPurger : public Timer
 {
- public:
+public:
 	BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { }
 
 	void Tick(time_t) override
@@ -1086,7 +1086,7 @@ class BSKick : public Module
 		ci->c->Kick(ci->bi, u, "%s", buf);
 	}
 
- public:
+public:
 	BSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		bandata(this, "bandata"),
 		userdata(this, "userdata"),
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 0670b537f..83bd6bc9b 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSSet : public Command
 {
- public:
+public:
 	CommandBSSet(Module *creator) : Command(creator, "botserv/set", 3, 3)
 	{
 		this->SetDesc(_("Configures bot options"));
@@ -66,13 +66,13 @@ class CommandBSSet : public Command
 
 class CommandBSSetBanExpire : public Command
 {
- public:
+public:
 	class UnbanTimer : public Timer
 	{
 		Anope::string chname;
 		Anope::string mask;
 
-	 public:
+	public:
 		UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t) : Timer(creator, t), chname(ch), mask(bmask) { }
 
 		void Tick(time_t) override
@@ -153,7 +153,7 @@ class CommandBSSetBanExpire : public Command
 
 class CommandBSSetPrivate : public Command
 {
- public:
+public:
 	CommandBSSetPrivate(Module *creator, const Anope::string &sname = "botserv/set/private") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Prevent a bot from being assigned by non IRC operators"));
@@ -207,7 +207,7 @@ class BSSet : public Module
 	CommandBSSetBanExpire commandbssetbanexpire;
 	CommandBSSetPrivate commandbssetprivate;
 
- public:
+public:
 	BSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandbsset(this), commandbssetbanexpire(this),
 		commandbssetprivate(this)
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 9c0caa9c7..451df5698 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -22,7 +22,7 @@ static inline void reset_levels(ChannelInfo *ci)
 
 class AccessChanAccess : public ChanAccess
 {
- public:
+public:
 	int level = 0;
 
 	AccessChanAccess(AccessProvider *p) : ChanAccess(p)
@@ -69,7 +69,7 @@ class AccessChanAccess : public ChanAccess
 
 class AccessAccessProvider : public AccessProvider
 {
- public:
+public:
 	static AccessAccessProvider *me;
 
 	AccessAccessProvider(Module *o) : AccessProvider(o, "access/access")
@@ -266,7 +266,7 @@ class CommandCSAccess : public Command
 				Anope::string Nicks;
 				bool denied = false;
 				bool override = false;
-			 public:
+			public:
 				AccessDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &numlist) : NumberList(numlist, true), source(_source), ci(_ci), c(_c)
 				{
 					if (!source.AccessFor(ci).HasPriv("ACCESS_CHANGE") && source.HasPriv("chanserv/access/modify"))
@@ -366,7 +366,7 @@ class CommandCSAccess : public Command
 				ListFormatter &list;
 				ChannelInfo *ci;
 
-			 public:
+			public:
 				AccessListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
 				{
 				}
@@ -510,7 +510,7 @@ class CommandCSAccess : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSAccess(Module *creator) : Command(creator, "chanserv/access", 2, 5)
 	{
 		this->SetDesc(_("Modify the list of privileged users"));
@@ -752,7 +752,7 @@ class CommandCSLevels : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSLevels(Module *creator) : Command(creator, "chanserv/levels", 2, 4)
 	{
 		this->SetDesc(_("Redefine the meanings of access levels"));
@@ -863,7 +863,7 @@ class CSAccess : public Module
 	CommandCSAccess commandcsaccess;
 	CommandCSLevels commandcslevels;
 
- public:
+public:
 	CSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		accessprovider(this), commandcsaccess(this), commandcslevels(this)
 	{
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 78215dacd..fc572344c 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -210,7 +210,7 @@ class CommandCSAKick : public Command
 				Command *c;
 				unsigned deleted = 0;
 				AccessGroup ag;
-			 public:
+			public:
 				AkickDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), source(_source), ci(_ci), c(_c), ag(source.AccessFor(ci))
 				{
 				}
@@ -285,7 +285,7 @@ class CommandCSAKick : public Command
 				ListFormatter &list;
 				ChannelInfo *ci;
 
-			 public:
+			public:
 				AkickListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
 				{
 				}
@@ -425,7 +425,7 @@ class CommandCSAKick : public Command
 		source.Reply(_("Channel %s akick list has been cleared."), ci->name.c_str());
 	}
 
- public:
+public:
 	CommandCSAKick(Module *creator) : Command(creator, "chanserv/akick", 2, 4)
 	{
 		this->SetDesc(_("Maintain the AutoKick list"));
@@ -529,7 +529,7 @@ class CSAKick : public Module
 {
 	CommandCSAKick commandcsakick;
 
- public:
+public:
 	CSAKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsakick(this)
 	{
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 51e124948..eae94110e 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -15,12 +15,12 @@ static Module *me;
 
 class TempBan : public Timer
 {
- private:
+private:
 	Anope::string channel;
 	Anope::string mask;
 	Anope::string mode;
 
- public:
+public:
 	TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod) : Timer(me, seconds), channel(c->name), mask(banmask), mode(mod) { }
 
 	void Tick(time_t ctime) override
@@ -33,7 +33,7 @@ class TempBan : public Timer
 
 class CommandCSBan : public Command
 {
- public:
+public:
 	CommandCSBan(Module *creator) : Command(creator, "chanserv/ban", 2, 4)
 	{
 		this->SetDesc(_("Bans a given nick or mask on a channel"));
@@ -241,7 +241,7 @@ class CSBan : public Module
 {
 	CommandCSBan commandcsban;
 
- public:
+public:
 	CSBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsban(this)
 	{
 		me = this;
diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp
index c287f6a0b..200de399e 100644
--- a/modules/commands/cs_clone.cpp
+++ b/modules/commands/cs_clone.cpp
@@ -250,7 +250,7 @@ class CSClone : public Module
 {
 	CommandCSClone commandcsclone;
 
- public:
+public:
 	CSClone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsclone(this)
 	{
 
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 86fd3256a..2a4ac9c9b 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSDrop : public Command
 {
- public:
+public:
 	CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 2)
 	{
 		this->SetDesc(_("Cancel the registration of a channel"));
@@ -85,7 +85,7 @@ class CSDrop : public Module
 {
 	CommandCSDrop commandcsdrop;
 
- public:
+public:
 	CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsdrop(this)
 	{
 
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index eca2d0651..3e42c4166 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -15,7 +15,7 @@
 
 class CommandCSEnforce : public Command
 {
- private:
+private:
 	void DoSecureOps(CommandSource &source, ChannelInfo *ci)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("AKICK") && source.HasPriv("chanserv/access/modify");
@@ -206,7 +206,7 @@ class CommandCSEnforce : public Command
 		source.Reply(_("LIMIT enforced on %s, %d users removed."), ci->name.c_str(), users.size());
 	}
 
- public:
+public:
 	CommandCSEnforce(Module *creator) : Command(creator, "chanserv/enforce", 2, 2)
 	{
 		this->SetDesc(_("Enforce various channel modes and set options"));
@@ -266,7 +266,7 @@ class CSEnforce : public Module
 {
 	CommandCSEnforce commandcsenforce;
 
- public:
+public:
 	CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsenforce(this)
 	{
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index 0b6fdcbfe..f68ef3bde 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -99,7 +99,7 @@ Serializable* EntryMsgImpl::Unserialize(Serializable *obj, Serialize::Data &data
 
 class CommandEntryMessage : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source, ChannelInfo *ci)
 	{
 		EntryMessageList *messages = ci->Require<EntryMessageList>("entrymsg");
@@ -187,7 +187,7 @@ class CommandEntryMessage : public Command
 		source.Reply(_("Entry messages for \002%s\002 have been cleared."), ci->name.c_str());
 	}
 
- public:
+public:
 	CommandEntryMessage(Module *creator) : Command(creator, "chanserv/entrymsg", 2, 3)
 	{
 		this->SetDesc(_("Manage the channel's entry messages"));
@@ -266,7 +266,7 @@ class CSEntryMessage : public Module
 	ExtensibleItem<EntryMessageListImpl> eml;
 	Serialize::Type entrymsg_type;
 
- public:
+public:
 	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 	commandentrymsg(this),
 	eml(this, "entrymsg"), entrymsg_type("EntryMsg", EntryMsgImpl::Unserialize)
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index e1ea5ba00..f2f701125 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -15,7 +15,7 @@ static std::map<Anope::string, char> defaultFlags;
 
 class FlagsChanAccess : public ChanAccess
 {
- public:
+public:
 	std::set<char> flags;
 
 	FlagsChanAccess(AccessProvider *p) : ChanAccess(p)
@@ -61,7 +61,7 @@ class FlagsChanAccess : public ChanAccess
 
 class FlagsAccessProvider : public AccessProvider
 {
- public:
+public:
 	static FlagsAccessProvider *ap;
 
 	FlagsAccessProvider(Module *o) : AccessProvider(o, "access/flags")
@@ -375,7 +375,7 @@ class CommandCSFlags : public Command
 		return;
 	}
 
- public:
+public:
 	CommandCSFlags(Module *creator) : Command(creator, "chanserv/flags", 1, 5)
 	{
 		this->SetDesc(_("Modify the list of privileged users"));
@@ -480,7 +480,7 @@ class CSFlags : public Module
 	FlagsAccessProvider accessprovider;
 	CommandCSFlags commandcsflags;
 
- public:
+public:
 	CSFlags(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		accessprovider(this), commandcsflags(this)
 	{
diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp
index c184ecac2..659f3df05 100644
--- a/modules/commands/cs_getkey.cpp
+++ b/modules/commands/cs_getkey.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSGetKey : public Command
 {
- public:
+public:
 	CommandCSGetKey(Module *creator) : Command(creator, "chanserv/getkey", 1, 1)
 	{
 		this->SetDesc(_("Returns the key of the given channel"));
@@ -63,7 +63,7 @@ class CSGetKey : public Module
 {
 	CommandCSGetKey commandcsgetkey;
 
- public:
+public:
 	CSGetKey(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsgetkey(this)
 	{
 
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index d47f9f8c1..4b6dc453a 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSInfo : public Command
 {
- public:
+public:
 	CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2)
 	{
 		this->SetDesc(_("Lists information about the specified registered channel"));
@@ -87,7 +87,7 @@ class CSInfo : public Module
 {
 	CommandCSInfo commandcsinfo;
 
- public:
+public:
 	CSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsinfo(this)
 	{
diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp
index 91c98673f..6e3a71c6c 100644
--- a/modules/commands/cs_invite.cpp
+++ b/modules/commands/cs_invite.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSInvite : public Command
 {
- public:
+public:
 	CommandCSInvite(Module *creator) : Command(creator, "chanserv/invite", 1, 3)
 	{
 		this->SetDesc(_("Invites you or an optionally specified nick into a channel"));
@@ -101,7 +101,7 @@ class CSInvite : public Module
 {
 	CommandCSInvite commandcsinvite;
 
- public:
+public:
 	CSInvite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsinvite(this)
 	{
 
diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp
index 5d2bce871..b1ad5ed5c 100644
--- a/modules/commands/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSKick : public Command
 {
- public:
+public:
 	CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3)
 	{
 		this->SetDesc(_("Kicks a specified nick from a channel"));
@@ -137,7 +137,7 @@ class CSKick : public Module
 {
 	CommandCSKick commandcskick;
 
- public:
+public:
 	CSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcskick(this)
 	{
 
diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index 8323b6adb..f484ab088 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -14,7 +14,7 @@
 
 class CommandCSList : public Command
 {
- public:
+public:
 	CommandCSList(Module *creator) : Command(creator, "chanserv/list", 1, 2)
 	{
 		this->SetDesc(_("Lists all registered channels matching the given pattern"));
@@ -172,7 +172,7 @@ class CommandCSList : public Command
 
 class CommandCSSetPrivate : public Command
 {
- public:
+public:
 	CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Hide channel from the LIST command"));
@@ -245,7 +245,7 @@ class CSList : public Module
 
 	SerializableExtensibleItem<bool> priv;
 
- public:
+public:
 	CSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcslist(this), commandcssetprivate(this), priv(this, "CS_PRIVATE")
 	{
diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp
index 2a6f2d0ec..4f792d63e 100644
--- a/modules/commands/cs_log.cpp
+++ b/modules/commands/cs_log.cpp
@@ -295,7 +295,7 @@ class CSLog : public Module
 
 	std::vector<LogDefault> defaults;
 
- public:
+public:
 	CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		MSService("MemoServService", "MemoServ"), commandcslog(this),
 		logsettings(this, "logsettings"), logsetting_type("LogSetting", LogSettingImpl::Unserialize)
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index 69e2247ba..605886de9 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -717,7 +717,7 @@ class CommandCSMode : public Command
 		this->DoSet(source, ci, new_params);
 	}
 
- public:
+public:
 	CommandCSMode(Module *creator) : Command(creator, "chanserv/mode", 2, 4)
 	{
 		this->SetDesc(_("Control modes and mode locks on a channel"));
@@ -791,7 +791,7 @@ static Anope::map<std::pair<bool, Anope::string> > modes;
 
 class CommandCSModes : public Command
 {
- public:
+public:
 	CommandCSModes(Module *creator) : Command(creator, "chanserv/modes", 1, 2)
 	{
 		this->SetSyntax(_("\037channel\037 [\037user\037]"));
@@ -913,7 +913,7 @@ class CSMode : public Module
 	ExtensibleItem<ModeLocksImpl> modelocks;
 	Serialize::Type modelocks_type;
 
- public:
+public:
 	CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsmode(this), commandcsmodes(this),
 		modelocks(this, "modelocks"),
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index 76066349e..03d37232f 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSRegister : public Command
 {
- public:
+public:
 	CommandCSRegister(Module *creator) : Command(creator, "chanserv/register", 1, 2)
 	{
 		this->SetDesc(_("Register a channel"));
@@ -114,7 +114,7 @@ class CSRegister : public Module
 {
 	CommandCSRegister commandcsregister;
 
- public:
+public:
 	CSRegister(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsregister(this)
 	{
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 6bdb85bbf..8cf311e90 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -111,7 +111,7 @@ static bool ShouldHide(const Anope::string &channel, User *u)
 
 class CommandOSSeen : public Command
 {
- public:
+public:
 	CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2)
 	{
 		this->SetDesc(_("Statistics and maintenance for seen data"));
@@ -252,7 +252,7 @@ class CommandSeen : public Command
 			source.Reply(_("%s was last seen here %s ago."), na->nick.c_str(), Anope::Duration(Anope::CurTime - last, source.GetAccount()).c_str());
 	}
 
- public:
+public:
 	CommandSeen(Module *creator) : Command(creator, "chanserv/seen", 1, 2)
 	{
 		this->SetDesc(_("Tells you about the last time a user was seen"));
@@ -373,7 +373,7 @@ class CSSeen : public Module
 	Serialize::Type seeninfo_type;
 	CommandSeen commandseen;
 	CommandOSSeen commandosseen;
- public:
+public:
 	CSSeen(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), seeninfo_type("SeenInfo", SeenInfo::Unserialize), commandseen(this), commandosseen(this)
 	{
 	}
@@ -435,7 +435,7 @@ class CSSeen : public Module
 		UpdateUser(cu->user, KICK, cu->user->nick, source.GetSource(), cu->chan->name, msg);
 	}
 
- private:
+private:
 	void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message)
 	{
 		if (simple || !u->server->IsSynced())
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index 0456f56b8..fe86b9bc2 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -14,7 +14,7 @@
 
 class CommandCSSet : public Command
 {
- public:
+public:
 	CommandCSSet(Module *creator) : Command(creator, "chanserv/set", 2, 3)
 	{
 		this->SetDesc(_("Set channel options and information"));
@@ -66,7 +66,7 @@ class CommandCSSet : public Command
 
 class CommandCSSetAutoOp : public Command
 {
- public:
+public:
 	CommandCSSetAutoOp(Module *creator, const Anope::string &cname = "chanserv/set/autoop") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Should services automatically give status to users"));
@@ -129,7 +129,7 @@ class CommandCSSetAutoOp : public Command
 
 class CommandCSSetBanType : public Command
 {
- public:
+public:
 	CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set how services make bans on the channel"));
@@ -196,7 +196,7 @@ class CommandCSSetBanType : public Command
 
 class CommandCSSetDescription : public Command
 {
- public:
+public:
 	CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description") : Command(creator, cname, 1, 2)
 	{
 		this->SetDesc(_("Set the channel description"));
@@ -258,7 +258,7 @@ class CommandCSSetDescription : public Command
 
 class CommandCSSetFounder : public Command
 {
- public:
+public:
 	CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set the founder of a channel"));
@@ -327,7 +327,7 @@ class CommandCSSetFounder : public Command
 
 class CommandCSSetKeepModes : public Command
 {
- public:
+public:
 	CommandCSSetKeepModes(Module *creator, const Anope::string &cname = "chanserv/set/keepmodes") :  Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Retain modes when channel is not in use"));
@@ -392,7 +392,7 @@ class CommandCSSetKeepModes : public Command
 
 class CommandCSSetPeace : public Command
 {
- public:
+public:
 	CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Regulate the use of critical commands"));
@@ -464,7 +464,7 @@ inline static Anope::string BotModes()
 
 class CommandCSSetPersist : public Command
 {
- public:
+public:
 	CommandCSSetPersist(Module *creator, const Anope::string &cname = "chanserv/set/persist") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Set the channel as permanent"));
@@ -613,7 +613,7 @@ class CommandCSSetPersist : public Command
 
 class CommandCSSetRestricted : public Command
 {
- public:
+public:
 	CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Restrict access to the channel"));
@@ -675,7 +675,7 @@ class CommandCSSetRestricted : public Command
 
 class CommandCSSetSecure : public Command
 {
- public:
+public:
 	CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Activate security features"));
@@ -738,7 +738,7 @@ class CommandCSSetSecure : public Command
 
 class CommandCSSetSecureFounder : public Command
 {
- public:
+public:
 	CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Stricter control of channel founder status"));
@@ -802,7 +802,7 @@ class CommandCSSetSecureFounder : public Command
 
 class CommandCSSetSecureOps : public Command
 {
- public:
+public:
 	CommandCSSetSecureOps(Module *creator, const Anope::string &cname = "chanserv/set/secureops") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Stricter control of chanop status"));
@@ -864,7 +864,7 @@ class CommandCSSetSecureOps : public Command
 
 class CommandCSSetSignKick : public Command
 {
- public:
+public:
 	CommandCSSetSignKick(Module *creator, const Anope::string &cname = "chanserv/set/signkick") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Sign kicks that are done with the KICK command"));
@@ -941,7 +941,7 @@ class CommandCSSetSignKick : public Command
 
 class CommandCSSetSuccessor : public Command
 {
- public:
+public:
 	CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor") : Command(creator, cname, 1, 2)
 	{
 		this->SetDesc(_("Set the successor for a channel"));
@@ -1035,7 +1035,7 @@ class CommandCSSetSuccessor : public Command
 
 class CommandCSSetNoexpire : public Command
 {
- public:
+public:
 	CommandCSSetNoexpire(Module *creator) : Command(creator, "chanserv/saset/noexpire", 2, 2)
 	{
 		this->SetDesc(_("Prevent the channel from expiring"));
@@ -1163,7 +1163,7 @@ class CSSet : public Module
 
 	bool persist_lower_ts;
 
- public:
+public:
 	CSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		noautoop(this, "NOAUTOOP"), peace(this, "PEACE"),
 		securefounder(this, "SECUREFOUNDER"), restricted(this, "RESTRICTED"),
diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp
index 86233c97a..e7b5c496e 100644
--- a/modules/commands/cs_set_misc.cpp
+++ b/modules/commands/cs_set_misc.cpp
@@ -90,7 +90,7 @@ static Anope::string GetAttribute(const Anope::string &command)
 
 class CommandCSSetMisc : public Command
 {
- public:
+public:
 	CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc") : Command(creator, cname, 1, 2)
 	{
 		this->SetSyntax(_("\037channel\037 [\037parameters\037]"));
@@ -169,7 +169,7 @@ class CSSetMisc : public Module
 	CommandCSSetMisc commandcssetmisc;
 	Serialize::Type csmiscdata_type;
 
- public:
+public:
 	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssetmisc(this), csmiscdata_type("CSMiscData", CSMiscData::Unserialize)
 	{
diff --git a/modules/commands/cs_status.cpp b/modules/commands/cs_status.cpp
index 9d5f856f8..7135fcbba 100644
--- a/modules/commands/cs_status.cpp
+++ b/modules/commands/cs_status.cpp
@@ -114,7 +114,7 @@ class CSStatus : public Module
 {
 	CommandCSStatus commandcsstatus;
 
- public:
+public:
 	CSStatus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsstatus(this)
 	{
 	}
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index cae0bbdb9..cce4dcf66 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -52,7 +52,7 @@ struct CSSuspendInfo : SuspendInfo, Serializable
 
 class CommandCSSuspend : public Command
 {
- public:
+public:
 	CommandCSSuspend(Module *creator) : Command(creator, "chanserv/suspend", 2, 3)
 	{
 		this->SetDesc(_("Prevent a channel from being used preserving channel data and settings"));
@@ -144,7 +144,7 @@ class CommandCSSuspend : public Command
 
 class CommandCSUnSuspend : public Command
 {
- public:
+public:
 	CommandCSUnSuspend(Module *creator) : Command(creator, "chanserv/unsuspend", 1, 1)
 	{
 		this->SetDesc(_("Releases a suspended channel"));
@@ -214,7 +214,7 @@ class CSSuspend : public Module
 		return source.IsOper() || std::find(show.begin(), show.end(), what) != show.end();
 	}
 
- public:
+public:
 	CSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssuspend(this), commandcsunsuspend(this), suspend(this, "CS_SUSPENDED"),
 		suspend_type("CSSuspendInfo", CSSuspendInfo::Unserialize)
diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 2610f521c..66d098542 100644
--- a/modules/commands/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSSync : public Command
 {
- public:
+public:
 	CommandCSSync(Module *creator) : Command(creator, "chanserv/sync", 1, 1)
 	{
 		this->SetDesc(_("Sync users channel modes"));
@@ -55,7 +55,7 @@ class CommandCSSync : public Command
 class CSSync : public Module
 {
 	CommandCSSync commandcssync;
- public:
+public:
 	CSSync(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcssync(this)
 	{
diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp
index 7e71020a1..2601e771d 100644
--- a/modules/commands/cs_topic.cpp
+++ b/modules/commands/cs_topic.cpp
@@ -14,7 +14,7 @@
 
 class CommandCSSetKeepTopic : public Command
 {
- public:
+public:
 	CommandCSSetKeepTopic(Module *creator, const Anope::string &cname = "chanserv/set/keeptopic") : Command(creator, cname, 2, 2)
 	{
 		this->SetDesc(_("Retain topic when channel is not in use"));
@@ -142,7 +142,7 @@ class CommandCSTopic : public Command
 		this->Set(source, ci, new_topic);
 	}
 
- public:
+public:
 	CommandCSTopic(Module *creator) : Command(creator, "chanserv/topic", 2, 3),
 		topiclock("TOPICLOCK")
 	{
@@ -209,7 +209,7 @@ class CSTopic : public Module
 
 	SerializableExtensibleItem<bool> topiclock, keeptopic;
 
- public:
+public:
 	CSTopic(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcstopic(this), commandcssetkeeptopic(this), topiclock(this, "TOPICLOCK"), keeptopic(this, "KEEPTOPIC")
 	{
diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp
index 832c1cfcb..90c070d65 100644
--- a/modules/commands/cs_unban.cpp
+++ b/modules/commands/cs_unban.cpp
@@ -13,7 +13,7 @@
 
 class CommandCSUnban : public Command
 {
- public:
+public:
 	CommandCSUnban(Module *creator) : Command(creator, "chanserv/unban", 0, 2)
 	{
 		this->SetDesc(_("Remove all bans preventing a user from entering a channel"));
@@ -119,7 +119,7 @@ class CSUnban : public Module
 {
 	CommandCSUnban commandcsunban;
 
- public:
+public:
 	CSUnban(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsunban(this)
 	{
diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
index 59bd19660..1299f59bd 100644
--- a/modules/commands/cs_updown.cpp
+++ b/modules/commands/cs_updown.cpp
@@ -41,7 +41,7 @@ class CommandCSUp : public Command
 			}
 		}
 	}
- public:
+public:
 	CommandCSUp(Module *creator) : Command(creator, "chanserv/up", 0, 2)
 	{
 		this->SetDesc(_("Updates a selected nicks status on a channel"));
@@ -139,7 +139,7 @@ class CommandCSDown : public Command
 				c->RemoveMode(NULL, ModeManager::FindChannelModeByChar(cu->status.Modes()[--i]), u->GetUID());
 	}
 
- public:
+public:
 	CommandCSDown(Module *creator) : Command(creator, "chanserv/down", 0, 2)
 	{
 		this->SetDesc(_("Removes a selected nicks status from a channel"));
@@ -231,7 +231,7 @@ class CSUpDown : public Module
 	CommandCSUp commandcsup;
 	CommandCSDown commandcsdown;
 
- public:
+public:
 	CSUpDown(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsup(this), commandcsdown(this)
 	{
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 051af5470..54c079001 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -19,7 +19,7 @@ namespace
 
 class XOPChanAccess : public ChanAccess
 {
- public:
+public:
 	Anope::string type;
 
 	XOPChanAccess(AccessProvider *p) : ChanAccess(p)
@@ -86,7 +86,7 @@ class XOPChanAccess : public ChanAccess
 
 class XOPAccessProvider : public AccessProvider
 {
- public:
+public:
 	XOPAccessProvider(Module *o) : AccessProvider(o, "access/xop")
 	{
 	}
@@ -99,7 +99,7 @@ class XOPAccessProvider : public AccessProvider
 
 class CommandCSXOP : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
 	{
 		Anope::string mask = params.size() > 2 ? params[2] : "";
@@ -299,7 +299,7 @@ class CommandCSXOP : public Command
 				unsigned deleted = 0;
 				Anope::string nicks;
 				bool override;
-			 public:
+			public:
 				XOPDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, bool _override, const Anope::string &numlist) : NumberList(numlist, true), source(_source), ci(_ci), c(_c), override(_override)
 				{
 				}
@@ -399,7 +399,7 @@ class CommandCSXOP : public Command
 				ListFormatter &list;
 				ChannelInfo *ci;
 				CommandSource &source;
-			 public:
+			public:
 				XOPListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist, CommandSource &src) : NumberList(numlist, false), list(_list), ci(_ci), source(src)
 				{
 				}
@@ -493,7 +493,7 @@ class CommandCSXOP : public Command
 		source.Reply(_("Channel %s %s list has been cleared."), ci->name.c_str(), source.command.c_str());
 	}
 
- public:
+public:
 	CommandCSXOP(Module *modname) : Command(modname, "chanserv/xop", 2, 4)
 	{
 		this->SetSyntax(_("\037channel\037 ADD \037mask\037 [\037description\037]"));
@@ -600,7 +600,7 @@ class CSXOP : public Module
 	XOPAccessProvider accessprovider;
 	CommandCSXOP commandcsxop;
 
- public:
+public:
 	CSXOP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		accessprovider(this), commandcsxop(this)
 	{
diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp
index 072b786dc..178d87eb1 100644
--- a/modules/commands/gl_global.cpp
+++ b/modules/commands/gl_global.cpp
@@ -15,7 +15,7 @@ class CommandGLGlobal : public Command
 {
 	ServiceReference<GlobalService> GService;
 
- public:
+public:
 	CommandGLGlobal(Module *creator) : Command(creator, "global/global", 1, 1), GService("GlobalService", "Global")
 	{
 		this->SetDesc(_("Send a message to all users"));
@@ -55,7 +55,7 @@ class GLGlobal : public Module
 {
 	CommandGLGlobal commandglglobal;
 
- public:
+public:
 	GLGlobal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandglglobal(this)
 	{
diff --git a/modules/commands/greet.cpp b/modules/commands/greet.cpp
index 0ebad1864..3cfe11262 100644
--- a/modules/commands/greet.cpp
+++ b/modules/commands/greet.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSSetGreet : public Command
 {
- public:
+public:
 	CommandBSSetGreet(Module *creator, const Anope::string &sname = "botserv/set/greet") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Enable greet messages"));
@@ -77,7 +77,7 @@ class CommandBSSetGreet : public Command
 
 class CommandNSSetGreet : public Command
 {
- public:
+public:
 	CommandNSSetGreet(Module *creator, const Anope::string &sname = "nickserv/set/greet", size_t min = 0) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Associate a greet message with your nickname"));
@@ -138,7 +138,7 @@ class CommandNSSetGreet : public Command
 
 class CommandNSSASetGreet : public CommandNSSetGreet
 {
- public:
+public:
 	CommandNSSASetGreet(Module *creator) : CommandNSSetGreet(creator, "nickserv/saset/greet", 1)
 	{
 		this->ClearSyntax();
@@ -173,7 +173,7 @@ class Greet : public Module
 	CommandNSSetGreet commandnssetgreet;
 	CommandNSSASetGreet commandnssasetgreet;
 
- public:
+public:
 	Greet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		bs_greet(this, "BS_GREET"),
 		ns_greet(this, "greet"),
diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp
index 071161fcd..3f1ac5a42 100644
--- a/modules/commands/help.cpp
+++ b/modules/commands/help.cpp
@@ -26,7 +26,7 @@ class CommandHelp : public Command
 		return NULL;
 	}
 
- public:
+public:
 	CommandHelp(Module *creator) : Command(creator, "generic/help", 0)
 	{
 		this->SetDesc(_("Displays this list and give information about commands"));
@@ -186,7 +186,7 @@ class Help : public Module
 {
 	CommandHelp commandhelp;
 
- public:
+public:
 	Help(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhelp(this)
 	{
diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp
index 9d4514907..d2b43433c 100644
--- a/modules/commands/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
@@ -13,7 +13,7 @@
 
 class CommandHSDel : public Command
 {
- public:
+public:
 	CommandHSDel(Module *creator) : Command(creator, "hostserv/del", 1, 1)
 	{
 		this->SetDesc(_("Delete the vhost of another user"));
@@ -53,7 +53,7 @@ class CommandHSDel : public Command
 
 class CommandHSDelAll : public Command
 {
- public:
+public:
 	CommandHSDelAll(Module *creator) : Command(creator, "hostserv/delall", 1, 1)
 	{
 		this->SetDesc(_("Deletes the vhost for all nicks in a group"));
@@ -101,7 +101,7 @@ class HSDel : public Module
 	CommandHSDel commandhsdel;
 	CommandHSDelAll commandhsdelall;
 
- public:
+public:
 	HSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhsdel(this), commandhsdelall(this)
 	{
diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp
index 03e1dc333..a492e50c5 100644
--- a/modules/commands/hs_group.cpp
+++ b/modules/commands/hs_group.cpp
@@ -15,7 +15,7 @@ class CommandHSGroup : public Command
 {
 	bool setting = false;
 
- public:
+public:
 	void Sync(const NickAlias *na)
 	{
 		if (setting)
@@ -81,7 +81,7 @@ class HSGroup : public Module
 	bool syncongroup;
 	bool synconset;
 
- public:
+public:
 	HSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhsgroup(this)
 	{
diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp
index 00f2915d1..cb1dc4d17 100644
--- a/modules/commands/hs_list.cpp
+++ b/modules/commands/hs_list.cpp
@@ -13,7 +13,7 @@
 
 class CommandHSList : public Command
 {
- public:
+public:
 	CommandHSList(Module *creator) : Command(creator, "hostserv/list", 0, 1)
 	{
 		this->SetDesc(_("Displays one or more vhost entries"));
@@ -146,7 +146,7 @@ class HSList : public Module
 {
 	CommandHSList commandhslist;
 
- public:
+public:
 	HSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhslist(this)
 	{
diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp
index e2325bb45..67d0520fb 100644
--- a/modules/commands/hs_off.cpp
+++ b/modules/commands/hs_off.cpp
@@ -13,7 +13,7 @@
 
 class CommandHSOff : public Command
 {
- public:
+public:
 	CommandHSOff(Module *creator) : Command(creator, "hostserv/off", 0, 0)
 	{
 		this->SetDesc(_("Deactivates your assigned vhost"));
@@ -57,7 +57,7 @@ class HSOff : public Module
 {
 	CommandHSOff commandhsoff;
 
- public:
+public:
 	HSOff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhsoff(this)
 	{
diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp
index a3feffbaf..a7f67de2f 100644
--- a/modules/commands/hs_on.cpp
+++ b/modules/commands/hs_on.cpp
@@ -13,7 +13,7 @@
 
 class CommandHSOn : public Command
 {
- public:
+public:
 	CommandHSOn(Module *creator) : Command(creator, "hostserv/on", 0, 0)
 	{
 		this->SetDesc(_("Activates your assigned vhost"));
@@ -63,7 +63,7 @@ class HSOn : public Module
 {
 	CommandHSOn commandhson;
 
- public:
+public:
 	HSOn(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhson(this)
 	{
diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp
index c626deca2..74c869b86 100644
--- a/modules/commands/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
@@ -72,7 +72,7 @@ class CommandHSRequest : public Command
 		return false;
 	}
 
- public:
+public:
 	CommandHSRequest(Module *creator) : Command(creator, "hostserv/request", 1, 1)
 	{
 		this->SetDesc(_("Request a vHost for your nick"));
@@ -187,7 +187,7 @@ class CommandHSRequest : public Command
 
 class CommandHSActivate : public Command
 {
- public:
+public:
 	CommandHSActivate(Module *creator) : Command(creator, "hostserv/activate", 1, 1)
 	{
 		this->SetDesc(_("Approve the requested vHost of a user"));
@@ -236,7 +236,7 @@ class CommandHSActivate : public Command
 
 class CommandHSReject : public Command
 {
- public:
+public:
 	CommandHSReject(Module *creator) : Command(creator, "hostserv/reject", 1, 2)
 	{
 		this->SetDesc(_("Reject the requested vHost of a user"));
@@ -292,7 +292,7 @@ class CommandHSReject : public Command
 
 class CommandHSWaiting : public Command
 {
- public:
+public:
 	CommandHSWaiting(Module *creator) : Command(creator, "hostserv/waiting", 0, 0)
 	{
 		this->SetDesc(_("Retrieves the vhost requests"));
@@ -357,7 +357,7 @@ class HSRequest : public Module
 	ExtensibleItem<HostRequest> hostrequest;
 	Serialize::Type request_type;
 
- public:
+public:
 	HSRequest(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandhsrequest(this), commandhsactive(this),
 		commandhsreject(this), commandhswaiting(this), hostrequest(this, "hostrequest"), request_type("HostRequest", HostRequest::Unserialize)
diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp
index 926dc3bfe..f9e2ed49e 100644
--- a/modules/commands/hs_set.cpp
+++ b/modules/commands/hs_set.cpp
@@ -13,7 +13,7 @@
 
 class CommandHSSet : public Command
 {
- public:
+public:
 	CommandHSSet(Module *creator) : Command(creator, "hostserv/set", 2, 2)
 	{
 		this->SetDesc(_("Set the vhost of another user"));
@@ -118,7 +118,7 @@ class CommandHSSetAll : public Command
 		}
 	}
 
- public:
+public:
 	CommandHSSetAll(Module *creator) : Command(creator, "hostserv/setall", 2, 2)
 	{
 		this->SetDesc(_("Set the vhost for all nicks in a group"));
@@ -217,7 +217,7 @@ class HSSet : public Module
 	CommandHSSet commandhsset;
 	CommandHSSetAll commandhssetall;
 
- public:
+public:
 	HSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhsset(this), commandhssetall(this)
 	{
 		if (!IRCD || !IRCD->CanSetVHost)
diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp
index d9f10b104..3d7c5b3bf 100644
--- a/modules/commands/ms_cancel.cpp
+++ b/modules/commands/ms_cancel.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSCancel : public Command
 {
- public:
+public:
 	CommandMSCancel(Module *creator) : Command(creator, "memoserv/cancel", 1, 1)
 	{
 		this->SetDesc(_("Cancel the last memo you sent"));
@@ -91,7 +91,7 @@ class MSCancel : public Module
 {
 	CommandMSCancel commandmscancel;
 
- public:
+public:
 	MSCancel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmscancel(this)
 	{
diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp
index a0b50eeb9..61fb809a7 100644
--- a/modules/commands/ms_check.cpp
+++ b/modules/commands/ms_check.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSCheck : public Command
 {
- public:
+public:
 	CommandMSCheck(Module *creator) : Command(creator, "memoserv/check", 1, 1)
 	{
 		this->SetDesc(_("Checks if last memo to a nick was read"));
@@ -76,7 +76,7 @@ class MSCheck : public Module
 {
 	CommandMSCheck commandmscheck;
 
- public:
+public:
 	MSCheck(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmscheck(this)
 	{
diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp
index eefd7add7..795b2992c 100644
--- a/modules/commands/ms_del.cpp
+++ b/modules/commands/ms_del.cpp
@@ -17,7 +17,7 @@ class MemoDelCallback : public NumberList
 	Command *cmd;
 	ChannelInfo *ci;
 	MemoInfo *mi;
- public:
+public:
 	MemoDelCallback(CommandSource &_source, Command *c, ChannelInfo *_ci, MemoInfo *_mi, const Anope::string &list) : NumberList(list, true), source(_source), cmd(c), ci(_ci), mi(_mi)
 	{
 	}
@@ -38,7 +38,7 @@ class MemoDelCallback : public NumberList
 
 class CommandMSDel : public Command
 {
- public:
+public:
 	CommandMSDel(Module *creator) : Command(creator, "memoserv/del", 0, 2)
 	{
 		this->SetDesc(_("Delete a memo or memos"));
@@ -148,7 +148,7 @@ class MSDel : public Module
 {
 	CommandMSDel commandmsdel;
 
- public:
+public:
 	MSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsdel(this)
 	{
diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp
index ca6e1ae86..9b8426445 100644
--- a/modules/commands/ms_ignore.cpp
+++ b/modules/commands/ms_ignore.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSIgnore : public Command
 {
- public:
+public:
 	CommandMSIgnore(Module *creator) : Command(creator, "memoserv/ignore", 1, 3)
 	{
 		this->SetDesc(_("Manage the memo ignore list"));
@@ -122,7 +122,7 @@ class MSIgnore : public Module
 {
 	CommandMSIgnore commandmsignore;
 
- public:
+public:
 	MSIgnore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsignore(this)
 	{
diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp
index f9dd20740..2043a3c73 100644
--- a/modules/commands/ms_info.cpp
+++ b/modules/commands/ms_info.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSInfo : public Command
 {
- public:
+public:
 	CommandMSInfo(Module *creator) : Command(creator, "memoserv/info", 0, 1)
 	{
 		this->SetDesc(_("Displays information about your memos"));
@@ -220,7 +220,7 @@ class MSInfo : public Module
 {
 	CommandMSInfo commandmsinfo;
 
- public:
+public:
 	MSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsinfo(this)
 	{
diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp
index 728fe1a71..0df0b983e 100644
--- a/modules/commands/ms_list.cpp
+++ b/modules/commands/ms_list.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSList : public Command
 {
- public:
+public:
 	CommandMSList(Module *creator) : Command(creator, "memoserv/list", 0, 2)
 	{
 		this->SetDesc(_("List your memos"));
@@ -70,7 +70,7 @@ class CommandMSList : public Command
 					ListFormatter &list;
 					CommandSource &source;
 					const MemoInfo *mi;
-				 public:
+				public:
 					MemoListCallback(ListFormatter &_list, CommandSource &_source, const MemoInfo *_mi, const Anope::string &numlist) : NumberList(numlist, false), list(_list), source(_source), mi(_mi)
 					{
 					}
@@ -153,7 +153,7 @@ class MSList : public Module
 {
 	CommandMSList commandmslist;
 
- public:
+public:
 	MSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmslist(this)
 	{
diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp
index 0fee45e31..740243914 100644
--- a/modules/commands/ms_read.cpp
+++ b/modules/commands/ms_read.cpp
@@ -53,7 +53,7 @@ class MemoListCallback : public NumberList
 	MemoInfo *mi;
 	const ChannelInfo *ci;
 	bool found;
- public:
+public:
 	MemoListCallback(CommandSource &_source, MemoInfo *_mi, const ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), source(_source), mi(_mi), ci(_ci)
 	{
 		found = false;
@@ -106,7 +106,7 @@ class MemoListCallback : public NumberList
 
 class CommandMSRead : public Command
 {
- public:
+public:
 	CommandMSRead(Module *creator) : Command(creator, "memoserv/read", 1, 2)
 	{
 		this->SetDesc(_("Read a memo or memos"));
@@ -213,7 +213,7 @@ class MSRead : public Module
 {
 	CommandMSRead commandmsread;
 
- public:
+public:
 	MSRead(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsread(this)
 	{
diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp
index bd88749a4..1e756b07e 100644
--- a/modules/commands/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
@@ -18,7 +18,7 @@ namespace
 
 class CommandMSRSend : public Command
 {
- public:
+public:
 	CommandMSRSend(Module *creator) : Command(creator, "memoserv/rsend", 2, 2)
 	{
 		this->SetDesc(_("Sends a memo and requests a read receipt"));
@@ -92,7 +92,7 @@ class MSRSend : public Module
 {
 	CommandMSRSend commandmsrsend;
 
- public:
+public:
 	MSRSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsrsend(this)
 	{
diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp
index 71d4cc7e4..fa641853a 100644
--- a/modules/commands/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
@@ -18,7 +18,7 @@ namespace
 
 class CommandMSSend : public Command
 {
- public:
+public:
 	CommandMSSend(Module *creator) : Command(creator, "memoserv/send", 2, 2)
 	{
 		this->SetDesc(_("Send a memo to a nick or channel"));
@@ -75,7 +75,7 @@ class MSSend : public Module
 {
 	CommandMSSend commandmssend;
 
- public:
+public:
 	MSSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmssend(this)
 	{
diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp
index 904e5e161..2885194ff 100644
--- a/modules/commands/ms_sendall.cpp
+++ b/modules/commands/ms_sendall.cpp
@@ -18,7 +18,7 @@ namespace
 
 class CommandMSSendAll : public Command
 {
- public:
+public:
 	CommandMSSendAll(Module *creator) : Command(creator, "memoserv/sendall", 1, 1)
 	{
 		this->SetDesc(_("Send a memo to all registered users"));
@@ -56,7 +56,7 @@ class MSSendAll : public Module
 {
 	CommandMSSendAll commandmssendall;
 
- public:
+public:
 	MSSendAll(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmssendall(this)
 	{
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index f1d2ebba6..85156b55c 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -13,7 +13,7 @@
 
 class CommandMSSet : public Command
 {
- private:
+private:
 	void DoNotify(CommandSource &source, const std::vector<Anope::string> &params, MemoInfo *mi)
 	{
 		const Anope::string &param = params[1];
@@ -200,7 +200,7 @@ class CommandMSSet : public Command
 		}
 		return;
 	}
- public:
+public:
 	CommandMSSet(Module *creator) : Command(creator, "memoserv/set", 2, 5)
 	{
 		this->SetDesc(_("Set options related to memos"));
@@ -303,7 +303,7 @@ class MSSet : public Module
 	CommandMSSet commandmsset;
 	SerializableExtensibleItem<bool> memo_signon, memo_receive, memo_mail, memo_hardmax;
 
- public:
+public:
 	MSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsset(this), memo_signon(this, "MEMO_SIGNON"), memo_receive(this, "MEMO_RECEIVE"), memo_mail(this, "MEMO_MAIL"),
 		memo_hardmax(this, "MEMO_HARDMAX")
diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp
index 2b0efae6d..ce562dd45 100644
--- a/modules/commands/ms_staff.cpp
+++ b/modules/commands/ms_staff.cpp
@@ -18,7 +18,7 @@ namespace
 
 class CommandMSStaff : public Command
 {
- public:
+public:
 	CommandMSStaff(Module *creator) : Command(creator, "memoserv/staff", 1, 1)
 	{
 		this->SetDesc(_("Send a memo to all opers/admins"));
@@ -53,7 +53,7 @@ class MSStaff : public Module
 {
 	CommandMSStaff commandmsstaff;
 
- public:
+public:
 	MSStaff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandmsstaff(this)
 	{
diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp
index d85277a51..1c63209a2 100644
--- a/modules/commands/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSAccess : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, NickCore *nc, const Anope::string &mask)
 	{
 		if (mask.empty())
@@ -95,7 +95,7 @@ class CommandNSAccess : public Command
 
 		return;
 	}
- public:
+public:
 	CommandNSAccess(Module *creator) : Command(creator, "nickserv/access", 1, 3)
 	{
 		this->SetDesc(_("Modify the list of authorized addresses"));
@@ -190,7 +190,7 @@ class NSAccess : public Module
 {
 	CommandNSAccess commandnsaccess;
 
- public:
+public:
 	NSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsaccess(this)
 	{
diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index a783708a9..a1937c838 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -224,7 +224,7 @@ class CommandNSAJoin : public Command
 			nc->Shrink<AJoinList>("ajoinlist");
 	}
 
- public:
+public:
 	CommandNSAJoin(Module *creator) : Command(creator, "nickserv/ajoin", 1, 4)
 	{
 		this->SetDesc(_("Manage your auto join list"));
@@ -303,7 +303,7 @@ class NSAJoin : public Module
 	ExtensibleItem<AJoinList> ajoinlist;
 	Serialize::Type ajoinentry_type;
 
- public:
+public:
 	NSAJoin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsajoin(this), ajoinlist(this, "ajoinlist"),
 		ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize)
diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp
index e0f160aa2..c8761d81c 100644
--- a/modules/commands/ns_alist.cpp
+++ b/modules/commands/ns_alist.cpp
@@ -18,7 +18,7 @@ class CommandNSAList : public Command
 		return ci::less()(ci1->name, ci2->name);
 	}
 
- public:
+public:
 	CommandNSAList(Module *creator) : Command(creator, "nickserv/alist", 0, 2)
 	{
 		this->SetDesc(_("List channels you have access on"));
@@ -135,7 +135,7 @@ class NSAList : public Module
 {
 	CommandNSAList commandnsalist;
 
- public:
+public:
 	NSAList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsalist(this)
 	{
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index 4e42d9fb5..3e163fcea 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -32,7 +32,7 @@ struct NSCertListImpl : NSCertList
 	Serialize::Reference<NickCore> nc;
 	std::vector<Anope::string> certs;
 
- public:
+public:
 	NSCertListImpl(Extensible *obj) : nc(anope_dynamic_static_cast<NickCore *>(obj)) { }
 
 	~NSCertListImpl() override
@@ -162,7 +162,7 @@ struct NSCertListImpl : NSCertList
 
 class CommandNSCert : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, NickCore *nc, Anope::string certfp)
 	{
 		NSCertList *cl = nc->Require<NSCertList>("certificates");
@@ -251,7 +251,7 @@ class CommandNSCert : public Command
 		}
 	}
 
- public:
+public:
 	CommandNSCert(Module *creator) : Command(creator, "nickserv/cert", 1, 3)
 	{
 		this->SetDesc(_("Modify the nickname client certificate list"));
@@ -344,7 +344,7 @@ class NSCert : public Module
 	NSCertListImpl::ExtensibleItem certs;
 	CertServiceImpl cs;
 
- public:
+public:
 	NSCert(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnscert(this), certs(this, "certificates"), cs(this)
 	{
diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp
index 3cf9c9bb0..d00dd943a 100644
--- a/modules/commands/ns_drop.cpp
+++ b/modules/commands/ns_drop.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSDrop : public Command
 {
- public:
+public:
 	CommandNSDrop(Module *creator) : Command(creator, "nickserv/drop", 1, 1)
 	{
 		this->SetSyntax(_("\037nickname\037"));
@@ -75,7 +75,7 @@ class NSDrop : public Module
 {
 	CommandNSDrop commandnsdrop;
 
- public:
+public:
 	NSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsdrop(this)
 	{
diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp
index de418cd0c..184e885c8 100644
--- a/modules/commands/ns_getemail.cpp
+++ b/modules/commands/ns_getemail.cpp
@@ -17,7 +17,7 @@
 
 class CommandNSGetEMail : public Command
 {
- public:
+public:
 	CommandNSGetEMail(Module *creator) : Command(creator, "nickserv/getemail", 1, 1)
 	{
 		this->SetDesc(_("Matches and returns all users that registered using given email"));
@@ -61,7 +61,7 @@ class CommandNSGetEMail : public Command
 class NSGetEMail : public Module
 {
 	CommandNSGetEMail commandnsgetemail;
- public:
+public:
 	NSGetEMail(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsgetemail(this)
 	{
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index af9b71584..bf510958b 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -19,7 +19,7 @@ class NSGroupRequest : public IdentifyRequest
 	Anope::string nick;
 	Reference<NickAlias> target;
 
- public:
+public:
 	NSGroupRequest(Module *o, CommandSource &src, Command *c, const Anope::string &n, NickAlias *targ, const Anope::string &pass) : IdentifyRequest(o, targ->nc->display, pass), source(src), cmd(c), nick(n), target(targ) { }
 
 	void OnSuccess() override
@@ -85,7 +85,7 @@ class NSGroupRequest : public IdentifyRequest
 
 class CommandNSGroup : public Command
 {
- public:
+public:
 	CommandNSGroup(Module *creator) : Command(creator, "nickserv/group", 0, 2)
 	{
 		this->SetDesc(_("Join a group"));
@@ -230,7 +230,7 @@ class CommandNSGroup : public Command
 
 class CommandNSUngroup : public Command
 {
- public:
+public:
 	CommandNSUngroup(Module *creator) : Command(creator, "nickserv/ungroup", 0, 1)
 	{
 		this->SetDesc(_("Remove a nick from a group"));
@@ -293,7 +293,7 @@ class CommandNSUngroup : public Command
 
 class CommandNSGList : public Command
 {
- public:
+public:
 	CommandNSGList(Module *creator) : Command(creator, "nickserv/glist", 0, 1)
 	{
 		this->SetDesc(_("Lists all nicknames in your group"));
@@ -382,7 +382,7 @@ class NSGroup : public Module
 	CommandNSUngroup commandnsungroup;
 	CommandNSGList commandnsglist;
 
- public:
+public:
 	NSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsgroup(this), commandnsungroup(this), commandnsglist(this)
 	{
diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp
index edab989e2..fe0656408 100644
--- a/modules/commands/ns_identify.cpp
+++ b/modules/commands/ns_identify.cpp
@@ -16,7 +16,7 @@ class NSIdentifyRequest : public IdentifyRequest
 	CommandSource source;
 	Command *cmd;
 
- public:
+public:
 	NSIdentifyRequest(Module *o, CommandSource &s, Command *c, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(o, acc, pass), source(s), cmd(c) { }
 
 	void OnSuccess() override
@@ -59,7 +59,7 @@ class NSIdentifyRequest : public IdentifyRequest
 
 class CommandNSIdentify : public Command
 {
- public:
+public:
 	CommandNSIdentify(Module *creator) : Command(creator, "nickserv/identify", 1, 2)
 	{
 		this->SetDesc(_("Identify yourself with your password"));
@@ -117,7 +117,7 @@ class NSIdentify : public Module
 {
 	CommandNSIdentify commandnsidentify;
 
- public:
+public:
 	NSIdentify(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsidentify(this)
 	{
diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp
index abe423acb..f5b6cabca 100644
--- a/modules/commands/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSInfo : public Command
 {
- public:
+public:
 	CommandNSInfo(Module *creator) : Command(creator, "nickserv/info", 0, 2)
 	{
 		this->SetDesc(_("Displays information about a given nickname"));
@@ -136,7 +136,7 @@ class CommandNSInfo : public Command
 
 class CommandNSSetHide : public Command
 {
- public:
+public:
 	CommandNSSetHide(Module *creator, const Anope::string &sname = "nickserv/set/hide", size_t min = 2) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Hide certain pieces of nickname information"));
@@ -234,7 +234,7 @@ class CommandNSSetHide : public Command
 
 class CommandNSSASetHide : public CommandNSSetHide
 {
- public:
+public:
 	CommandNSSASetHide(Module *creator) : CommandNSSetHide(creator, "nickserv/saset/hide", 3)
 	{
 		this->SetSyntax(_("\037nickname\037 {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}"));
@@ -270,7 +270,7 @@ class NSInfo : public Module
 
 	SerializableExtensibleItem<bool> hide_email, hide_usermask, hide_status, hide_quit;
 
- public:
+public:
 	NSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsinfo(this), commandnssethide(this), commandnssasethide(this),
 		 hide_email(this, "HIDE_EMAIL"), hide_usermask(this, "HIDE_MASK"), hide_status(this, "HIDE_STATUS"),
diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp
index 3c690984e..708958f41 100644
--- a/modules/commands/ns_list.cpp
+++ b/modules/commands/ns_list.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSList : public Command
 {
- public:
+public:
 	CommandNSList(Module *creator) : Command(creator, "nickserv/list", 1, 2)
 	{
 		this->SetDesc(_("List all registered nicknames that match a given pattern"));
@@ -178,7 +178,7 @@ class CommandNSList : public Command
 
 class CommandNSSetPrivate : public Command
 {
- public:
+public:
 	CommandNSSetPrivate(Module *creator, const Anope::string &sname = "nickserv/set/private", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Prevent the nickname from appearing in the LIST command"));
@@ -243,7 +243,7 @@ class CommandNSSetPrivate : public Command
 
 class CommandNSSASetPrivate : public CommandNSSetPrivate
 {
- public:
+public:
 	CommandNSSASetPrivate(Module *creator) : CommandNSSetPrivate(creator, "nickserv/saset/private", 2)
 	{
 		this->ClearSyntax();
@@ -279,7 +279,7 @@ class NSList : public Module
 
 	SerializableExtensibleItem<bool> priv;
 
- public:
+public:
 	NSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnslist(this), commandnssetprivate(this), commandnssasetprivate(this),
 		priv(this, "NS_PRIVATE")
diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp
index e281a9708..35396151d 100644
--- a/modules/commands/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
@@ -15,7 +15,7 @@ static ServiceReference<NickServService> NickServService("NickServService", "Nic
 
 class CommandNSLogout : public Command
 {
- public:
+public:
 	CommandNSLogout(Module *creator) : Command(creator, "nickserv/logout", 0, 2)
 	{
 		this->SetDesc(_("Reverses the effect of the IDENTIFY command"));
@@ -80,7 +80,7 @@ class NSLogout : public Module
 {
 	CommandNSLogout commandnslogout;
 
- public:
+public:
 	NSLogout(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnslogout(this)
 	{
diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index f8ca00329..b3275c9be 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -18,7 +18,7 @@ typedef std::map<Anope::string, ChannelStatus> NSRecoverInfo;
 
 class NSRecoverSvsnick
 {
- public:
+public:
 	Reference<User> from;
 	Anope::string to;
 };
@@ -29,7 +29,7 @@ class NSRecoverRequest : public IdentifyRequest
 	Command *cmd;
 	Anope::string user;
 
- public:
+public:
 	NSRecoverRequest(Module *o, CommandSource &src, Command *c, const Anope::string &nick, const Anope::string &pass) : IdentifyRequest(o, nick, pass), source(src), cmd(c), user(nick) { }
 
 	void OnSuccess() override
@@ -143,7 +143,7 @@ class NSRecoverRequest : public IdentifyRequest
 
 class CommandNSRecover : public Command
 {
- public:
+public:
 	CommandNSRecover(Module *creator) : Command(creator, "nickserv/recover", 1, 2)
 	{
 		this->SetDesc(_("Regains control of your nick"));
@@ -227,7 +227,7 @@ class NSRecover : public Module
 	PrimitiveExtensibleItem<NSRecoverInfo> recover;
 	PrimitiveExtensibleItem<NSRecoverSvsnick> svsnick;
 
- public:
+public:
 	NSRecover(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsrecover(this), recover(this, "recover"), svsnick(this, "svsnick")
 	{
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index 63c566a0c..7a3d3c1d1 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -15,7 +15,7 @@ static bool SendRegmail(User *u, const NickAlias *na, BotInfo *bi);
 
 class CommandNSConfirm : public Command
 {
- public:
+public:
 	CommandNSConfirm(Module *creator) : Command(creator, "nickserv/confirm", 1, 2)
 	{
 		this->SetDesc(_("Confirm a passcode"));
@@ -116,7 +116,7 @@ class CommandNSConfirm : public Command
 
 class CommandNSRegister : public Command
 {
- public:
+public:
 	CommandNSRegister(Module *creator) : Command(creator, "nickserv/register", 1, 2)
 	{
 		this->SetDesc(_("Register a nickname"));
@@ -307,7 +307,7 @@ class CommandNSRegister : public Command
 
 class CommandNSResend : public Command
 {
- public:
+public:
 	CommandNSResend(Module *creator) : Command(creator, "nickserv/resend", 0, 0)
 	{
 		this->SetDesc(_("Resend registration confirmation email"));
@@ -371,7 +371,7 @@ class NSRegister : public Module
 	SerializableExtensibleItem<bool> unconfirmed;
 	SerializableExtensibleItem<Anope::string> passcode;
 
- public:
+public:
 	NSRegister(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsregister(this), commandnsconfirm(this), commandnsrsend(this), unconfirmed(this, "UNCONFIRMED"),
 		passcode(this, "passcode")
diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp
index c0001cbe4..7be28a31b 100644
--- a/modules/commands/ns_resetpass.cpp
+++ b/modules/commands/ns_resetpass.cpp
@@ -15,7 +15,7 @@ static bool SendResetEmail(User *u, const NickAlias *na, BotInfo *bi);
 
 class CommandNSResetPass : public Command
 {
- public:
+public:
 	CommandNSResetPass(Module *creator) : Command(creator, "nickserv/resetpass", 2, 2)
 	{
 		this->SetDesc(_("Helps you reset lost passwords"));
@@ -65,7 +65,7 @@ class NSResetPass : public Module
 	CommandNSResetPass commandnsresetpass;
 	PrimitiveExtensibleItem<ResetInfo> reset;
 
- public:
+public:
 	NSResetPass(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsresetpass(this), reset(this, "reset")
 	{
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index f020d4959..08aabccb7 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSSet : public Command
 {
- public:
+public:
 	CommandNSSet(Module *creator) : Command(creator, "nickserv/set", 1, 3)
 	{
 		this->SetDesc(_("Set options, including kill protection"));
@@ -65,7 +65,7 @@ class CommandNSSet : public Command
 
 class CommandNSSASet : public Command
 {
- public:
+public:
 	CommandNSSASet(Module *creator) : Command(creator, "nickserv/saset", 2, 4)
 	{
 		this->SetDesc(_("Set SET-options on another nickname"));
@@ -107,7 +107,7 @@ class CommandNSSASet : public Command
 
 class CommandNSSetPassword : public Command
 {
- public:
+public:
 	CommandNSSetPassword(Module *creator) : Command(creator, "nickserv/set/password", 1)
 	{
 		this->SetDesc(_("Set your nickname password"));
@@ -163,7 +163,7 @@ class CommandNSSetPassword : public Command
 
 class CommandNSSASetPassword : public Command
 {
- public:
+public:
 	CommandNSSASetPassword(Module *creator) : Command(creator, "nickserv/saset/password", 2, 2)
 	{
 		this->SetDesc(_("Set the nickname password"));
@@ -232,7 +232,7 @@ class CommandNSSASetPassword : public Command
 
 class CommandNSSetAutoOp : public Command
 {
- public:
+public:
 	CommandNSSetAutoOp(Module *creator, const Anope::string &sname = "nickserv/set/autoop", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Sets whether services should set channel status modes on you automatically."));
@@ -296,7 +296,7 @@ class CommandNSSetAutoOp : public Command
 
 class CommandNSSASetAutoOp : public CommandNSSetAutoOp
 {
- public:
+public:
 	CommandNSSASetAutoOp(Module *creator) : CommandNSSetAutoOp(creator, "nickserv/saset/autoop", 2)
 	{
 		this->ClearSyntax();
@@ -324,7 +324,7 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp
 
 class CommandNSSetNeverOp : public Command
 {
- public:
+public:
 	CommandNSSetNeverOp(Module *creator, const Anope::string &sname = "nickserv/set/neverop", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Sets whether you can be added to a channel access list."));
@@ -384,7 +384,7 @@ class CommandNSSetNeverOp : public Command
 
 class CommandNSSASetNeverOp : public CommandNSSetNeverOp
 {
- public:
+public:
 	CommandNSSASetNeverOp(Module *creator) : CommandNSSetNeverOp(creator, "nickserv/saset/neverop", 2)
 	{
 		this->ClearSyntax();
@@ -407,7 +407,7 @@ class CommandNSSASetNeverOp : public CommandNSSetNeverOp
 
 class CommandNSSetDisplay : public Command
 {
- public:
+public:
 	CommandNSSetDisplay(Module *creator, const Anope::string &sname = "nickserv/set/display", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Set the display of your group in Services"));
@@ -476,7 +476,7 @@ class CommandNSSetDisplay : public Command
 
 class CommandNSSASetDisplay : public CommandNSSetDisplay
 {
- public:
+public:
 	CommandNSSASetDisplay(Module *creator) : CommandNSSetDisplay(creator, "nickserv/saset/display", 2)
 	{
 		this->ClearSyntax();
@@ -530,7 +530,7 @@ class CommandNSSetEmail : public Command
 		return b;
 	}
 
- public:
+public:
 	CommandNSSetEmail(Module *creator, const Anope::string &cname = "nickserv/set/email", size_t min = 0) : Command(creator, cname, min, min + 1)
 	{
 		this->SetDesc(_("Associate an E-mail address with your nickname"));
@@ -623,7 +623,7 @@ class CommandNSSetEmail : public Command
 
 class CommandNSSASetEmail : public CommandNSSetEmail
 {
- public:
+public:
 	CommandNSSASetEmail(Module *creator) : CommandNSSetEmail(creator, "nickserv/saset/email", 2)
 	{
 		this->ClearSyntax();
@@ -646,7 +646,7 @@ class CommandNSSASetEmail : public CommandNSSetEmail
 
 class CommandNSSetKeepModes : public Command
 {
- public:
+public:
 	CommandNSSetKeepModes(Module *creator, const Anope::string &sname = "nickserv/set/keepmodes", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Enable or disable keep modes"));
@@ -708,7 +708,7 @@ class CommandNSSetKeepModes : public Command
 
 class CommandNSSASetKeepModes : public CommandNSSetKeepModes
 {
- public:
+public:
 	CommandNSSASetKeepModes(Module *creator) : CommandNSSetKeepModes(creator, "nickserv/saset/keepmodes", 2)
 	{
 		this->ClearSyntax();
@@ -733,7 +733,7 @@ class CommandNSSASetKeepModes : public CommandNSSetKeepModes
 
 class CommandNSSetKill : public Command
 {
- public:
+public:
 	CommandNSSetKill(Module *creator, const Anope::string &sname = "nickserv/set/kill", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Turn protection on or off"));
@@ -837,7 +837,7 @@ class CommandNSSetKill : public Command
 
 class CommandNSSASetKill : public CommandNSSetKill
 {
- public:
+public:
 	CommandNSSASetKill(Module *creator) : CommandNSSetKill(creator, "nickserv/saset/kill", 2)
 	{
 		this->ClearSyntax();
@@ -871,7 +871,7 @@ class CommandNSSASetKill : public CommandNSSetKill
 
 class CommandNSSetLanguage : public Command
 {
- public:
+public:
 	CommandNSSetLanguage(Module *creator, const Anope::string &sname = "nickserv/set/language", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Set the language services will use when messaging you"));
@@ -949,7 +949,7 @@ class CommandNSSetLanguage : public Command
 
 class CommandNSSASetLanguage : public CommandNSSetLanguage
 {
- public:
+public:
 	CommandNSSASetLanguage(Module *creator) : CommandNSSetLanguage(creator, "nickserv/saset/language", 2)
 	{
 		this->ClearSyntax();
@@ -983,7 +983,7 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage
 
 class CommandNSSetMessage : public Command
 {
- public:
+public:
 	CommandNSSetMessage(Module *creator, const Anope::string &sname = "nickserv/set/message", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Change the communication method of services"));
@@ -1062,7 +1062,7 @@ class CommandNSSetMessage : public Command
 
 class CommandNSSASetMessage : public CommandNSSetMessage
 {
- public:
+public:
 	CommandNSSASetMessage(Module *creator) : CommandNSSetMessage(creator, "nickserv/saset/message", 2)
 	{
 		this->ClearSyntax();
@@ -1087,7 +1087,7 @@ class CommandNSSASetMessage : public CommandNSSetMessage
 
 class CommandNSSetSecure : public Command
 {
- public:
+public:
 	CommandNSSetSecure(Module *creator, const Anope::string &sname = "nickserv/set/secure", size_t min = 1) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Turn nickname security on or off"));
@@ -1153,7 +1153,7 @@ class CommandNSSetSecure : public Command
 
 class CommandNSSASetSecure : public CommandNSSetSecure
 {
- public:
+public:
 	CommandNSSASetSecure(Module *creator) : CommandNSSetSecure(creator, "nickserv/saset/secure", 2)
 	{
 		this->ClearSyntax();
@@ -1182,7 +1182,7 @@ class CommandNSSASetSecure : public CommandNSSetSecure
 
 class CommandNSSASetNoexpire : public Command
 {
- public:
+public:
 	CommandNSSASetNoexpire(Module *creator) : Command(creator, "nickserv/saset/noexpire", 1, 2)
 	{
 		this->SetDesc(_("Prevent the nickname from expiring"));
@@ -1321,7 +1321,7 @@ class NSSet : public Module
 	/* email, passcode */
 	PrimitiveExtensibleItem<std::pair<Anope::string, Anope::string > > ns_set_email;
 
- public:
+public:
 	NSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsset(this), commandnssaset(this),
 		commandnssetautoop(this), commandnssasetautoop(this),
diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index be2804f04..d48e7de09 100644
--- a/modules/commands/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
@@ -90,7 +90,7 @@ static Anope::string GetAttribute(const Anope::string &command)
 
 class CommandNSSetMisc : public Command
 {
- public:
+public:
 	CommandNSSetMisc(Module *creator, const Anope::string &cname = "nickserv/set/misc", size_t min = 0) : Command(creator, cname, min, min + 1)
 	{
 		this->SetSyntax(_("[\037parameter\037]"));
@@ -163,7 +163,7 @@ class CommandNSSetMisc : public Command
 
 class CommandNSSASetMisc : public CommandNSSetMisc
 {
- public:
+public:
 	CommandNSSASetMisc(Module *creator) : CommandNSSetMisc(creator, "nickserv/saset/misc", 1)
 	{
 		this->ClearSyntax();
@@ -182,7 +182,7 @@ class NSSetMisc : public Module
 	CommandNSSASetMisc commandnssasetmisc;
 	Serialize::Type nsmiscdata_type;
 
- public:
+public:
 	NSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnssetmisc(this), commandnssasetmisc(this), nsmiscdata_type("NSMiscData", NSMiscData::Unserialize)
 	{
diff --git a/modules/commands/ns_status.cpp b/modules/commands/ns_status.cpp
index 017da171d..a4d9409b8 100644
--- a/modules/commands/ns_status.cpp
+++ b/modules/commands/ns_status.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSStatus : public Command
 {
- public:
+public:
 	CommandNSStatus(Module *creator) : Command(creator, "nickserv/status", 0, 16)
 	{
 		this->SetDesc(_("Returns the owner status of the given nickname"));
@@ -76,7 +76,7 @@ class NSStatus : public Module
 {
 	CommandNSStatus commandnsstatus;
 
- public:
+public:
 	NSStatus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsstatus(this)
 	{
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index 28ca99b68..01bbe74de 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -54,7 +54,7 @@ struct NSSuspendInfo : SuspendInfo, Serializable
 
 class CommandNSSuspend : public Command
 {
- public:
+public:
 	CommandNSSuspend(Module *creator) : Command(creator, "nickserv/suspend", 2, 3)
 	{
 		this->SetDesc(_("Suspend a given nick"));
@@ -152,7 +152,7 @@ class CommandNSSuspend : public Command
 
 class CommandNSUnSuspend : public Command
 {
- public:
+public:
 	CommandNSUnSuspend(Module *creator) : Command(creator, "nickserv/unsuspend", 1, 1)
 	{
 		this->SetDesc(_("Unsuspend a given nick"));
@@ -220,7 +220,7 @@ class NSSuspend : public Module
 		return source.IsOper() || std::find(show.begin(), show.end(), what) != show.end();
 	}
 
- public:
+public:
 	NSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnssuspend(this), commandnsunsuspend(this), suspend(this, "NS_SUSPENDED"),
 		suspend_type("NSSuspendInfo", NSSuspendInfo::Unserialize)
diff --git a/modules/commands/ns_update.cpp b/modules/commands/ns_update.cpp
index 0d6a1f4c0..06e0d2307 100644
--- a/modules/commands/ns_update.cpp
+++ b/modules/commands/ns_update.cpp
@@ -13,7 +13,7 @@
 
 class CommandNSUpdate : public Command
 {
- public:
+public:
 	CommandNSUpdate(Module *creator) : Command(creator, "nickserv/update", 0, 0)
 	{
 		this->SetDesc(_("Updates your current status, i.e. it checks for new memos"));
@@ -51,7 +51,7 @@ class NSUpdate : public Module
 {
 	CommandNSUpdate commandnsupdate;
 
- public:
+public:
 	NSUpdate(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnsupdate(this)
 	{
diff --git a/modules/commands/os_akill.cpp b/modules/commands/os_akill.cpp
index 31f96b507..b6703ff22 100644
--- a/modules/commands/os_akill.cpp
+++ b/modules/commands/os_akill.cpp
@@ -18,7 +18,7 @@ class AkillDelCallback : public NumberList
 	CommandSource &source;
 	unsigned deleted = 0;
 	Command *cmd;
- public:
+public:
 	AkillDelCallback(CommandSource &_source, const Anope::string &numlist, Command *c) : NumberList(numlist, true), source(_source), cmd(c)
 	{
 	}
@@ -57,7 +57,7 @@ class AkillDelCallback : public NumberList
 
 class CommandOSAKill : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
 	{
 		Anope::string expiry, mask;
@@ -266,7 +266,7 @@ class CommandOSAKill : public Command
 			{
 				CommandSource &source;
 				ListFormatter &list;
-			 public:
+			public:
 				ListCallback(CommandSource &_source, ListFormatter &_list, const Anope::string &numstr) : NumberList(numstr, false), source(_source), list(_list)
 				{
 				}
@@ -379,7 +379,7 @@ class CommandOSAKill : public Command
 		if (Anope::ReadOnly)
 			source.Reply(READ_ONLY_MODE);
 	}
- public:
+public:
 	CommandOSAKill(Module *creator) : Command(creator, "operserv/akill", 1, 2)
 	{
 		this->SetDesc(_("Manipulate the AKILL list"));
@@ -472,7 +472,7 @@ class OSAKill : public Module
 {
 	CommandOSAKill commandosakill;
 
- public:
+public:
 	OSAKill(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosakill(this)
 	{
diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp
index a22eae178..b077cd033 100644
--- a/modules/commands/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
@@ -15,7 +15,7 @@ static ServiceReference<XLineManager> akills("XLineManager", "xlinemanager/sglin
 
 class CommandOSChanKill : public Command
 {
- public:
+public:
 	CommandOSChanKill(Module *creator) : Command(creator, "operserv/chankill", 2, 3)
 	{
 		this->SetDesc(_("AKILL all users on a specific channel"));
@@ -106,7 +106,7 @@ class OSChanKill : public Module
 {
 	CommandOSChanKill commandoschankill;
 
- public:
+public:
 	OSChanKill(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoschankill(this)
 	{
diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp
index 3f211d695..479a5e4d6 100644
--- a/modules/commands/os_config.cpp
+++ b/modules/commands/os_config.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSConfig : public Command
 {
- public:
+public:
 	CommandOSConfig(Module *creator) : Command(creator, "operserv/config", 1, 4)
 	{
 		this->SetDesc(_("View and change configuration file settings"));
@@ -136,7 +136,7 @@ class OSConfig : public Module
 {
 	CommandOSConfig commandosconfig;
 
- public:
+public:
 	OSConfig(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosconfig(this)
 	{
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 8a93a7f7b..50b51a990 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -109,7 +109,7 @@ class DefConTimeout : public Timer
 {
 	int level;
 
- public:
+public:
 	DefConTimeout(Module *mod, int newlevel) : Timer(mod, DConfig.timeout), level(newlevel)
 	{
 		timeout = this;
@@ -170,7 +170,7 @@ class CommandOSDefcon : public Command
 			source.Reply(_("* No new memos sent"));
 	}
 
- public:
+public:
 	CommandOSDefcon(Module *creator) : Command(creator, "operserv/defcon", 1, 1)
 	{
 		this->SetDesc(_("Manipulate the DefCon system"));
@@ -326,7 +326,7 @@ class OSDefcon : public Module
 		}
 	}
 
- public:
+public:
 	OSDefcon(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), session_service("SessionService", "session"), akills("XLineManager", "xlinemanager/sgline"), commandosdefcon(this)
 	{
 
diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp
index c297ec062..e9d8afc70 100644
--- a/modules/commands/os_dns.cpp
+++ b/modules/commands/os_dns.cpp
@@ -96,7 +96,7 @@ class DNSServer : public Serializable
 	/* is actually in the pool */
 	bool active = false;
 
- public:
+public:
 	std::set<Anope::string, ci::less> zones;
 	time_t repool = 0;
 
@@ -653,7 +653,7 @@ class CommandOSDNS : public Command
 		Log(LOG_ADMIN, source, this) << "to depool " << s->GetName();
 	}
 
- public:
+public:
 	CommandOSDNS(Module *creator) : Command(creator, "operserv/dns", 0, 4)
 	{
 		this->SetDesc(_("Manage DNS zones for this network"));
@@ -730,7 +730,7 @@ class ModuleDNS : public Module
 
 	time_t last_warn = 0;
 
- public:
+public:
 	ModuleDNS(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		zone_type("DNSZone", DNSZone::Unserialize), dns_type("DNSServer", DNSServer::Unserialize), commandosdns(this)
 	{
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp
index c17a719b7..68da1a8f0 100644
--- a/modules/commands/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
@@ -65,7 +65,7 @@ class MyForbidService : public ForbidService
 
 	inline std::vector<ForbidData *>& forbids(unsigned t) { return (*this->forbid_data)[t - 1]; }
 
- public:
+public:
 	MyForbidService(Module *m) : ForbidService(m), forbid_data("ForbidData") { }
 
 	~MyForbidService() override
@@ -149,7 +149,7 @@ class MyForbidService : public ForbidService
 class CommandOSForbid : public Command
 {
 	ServiceReference<ForbidService> fs;
- public:
+public:
 	CommandOSForbid(Module *creator) : Command(creator, "operserv/forbid", 1, 5), fs("ForbidService", "forbid")
 	{
 		this->SetDesc(_("Forbid usage of nicknames, channels, and emails"));
@@ -436,7 +436,7 @@ class OSForbid : public Module
 	Serialize::Type forbiddata_type;
 	CommandOSForbid commandosforbid;
 
- public:
+public:
 	OSForbid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		forbidService(this), forbiddata_type("ForbidData", ForbidDataImpl::Unserialize), commandosforbid(this)
 	{
diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp
index f779840fb..fea96f92b 100644
--- a/modules/commands/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
@@ -61,7 +61,7 @@ class OSIgnoreService : public IgnoreService
 {
 	Serialize::Checker<std::vector<IgnoreData *> > ignores;
 
- public:
+public:
 	OSIgnoreService(Module *o) : IgnoreService(o), ignores("IgnoreData") { }
 
 	void AddIgnore(IgnoreData *ign) override
@@ -156,7 +156,7 @@ class OSIgnoreService : public IgnoreService
 
 class CommandOSIgnore : public Command
 {
- private:
+private:
 	Anope::string RealMask(const Anope::string &mask)
 	{
 		/* If it s an existing user, we ignore the hostmask. */
@@ -335,7 +335,7 @@ class CommandOSIgnore : public Command
 		return;
 	}
 
- public:
+public:
 	CommandOSIgnore(Module *creator) : Command(creator, "operserv/ignore", 1, 4)
 	{
 		this->SetDesc(_("Modify the services ignore list"));
@@ -397,7 +397,7 @@ class OSIgnore : public Module
 	OSIgnoreService osignoreservice;
 	CommandOSIgnore commandosignore;
 
- public:
+public:
 	OSIgnore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		ignoredata_type("IgnoreData", IgnoreDataImpl::Unserialize), osignoreservice(this), commandosignore(this)
 	{
diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp
index 8015f835d..f65c2619f 100644
--- a/modules/commands/os_info.cpp
+++ b/modules/commands/os_info.cpp
@@ -95,7 +95,7 @@ Serializable *OperInfo::Unserialize(Serializable *obj, Serialize::Data &data)
 
 class CommandOSInfo : public Command
 {
- public:
+public:
 	CommandOSInfo(Module *creator) : Command(creator, "operserv/info", 2, 3)
 	{
 		this->SetDesc(_("Associate oper info with a nick or channel"));
@@ -266,7 +266,7 @@ class OSInfo : public Module
 		}
 	}
 
- public:
+public:
 	OSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosinfo(this), oinfo(this, "operinfo"), oinfo_type("OperInfo", OperInfo::Unserialize)
 	{
diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp
index 1a773dee9..1c91efc3b 100644
--- a/modules/commands/os_jupe.cpp
+++ b/modules/commands/os_jupe.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSJupe : public Command
 {
- public:
+public:
 	CommandOSJupe(Module *creator) : Command(creator, "operserv/jupe", 1, 2)
 	{
 		this->SetDesc(_("\"Jupiter\" a server"));
@@ -69,7 +69,7 @@ class OSJupe : public Module
 {
 	CommandOSJupe commandosjupe;
 
- public:
+public:
 	OSJupe(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosjupe(this)
 	{
diff --git a/modules/commands/os_kick.cpp b/modules/commands/os_kick.cpp
index 0330bb4ce..92cc60c14 100644
--- a/modules/commands/os_kick.cpp
+++ b/modules/commands/os_kick.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSKick : public Command
 {
- public:
+public:
 	CommandOSKick(Module *creator) : Command(creator, "operserv/kick", 3, 3)
 	{
 		this->SetDesc(_("Kick a user from a channel"));
@@ -73,7 +73,7 @@ class OSKick : public Module
 {
 	CommandOSKick commandoskick;
 
- public:
+public:
 	OSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoskick(this)
 	{
diff --git a/modules/commands/os_kill.cpp b/modules/commands/os_kill.cpp
index 4f9abd300..03bd40913 100644
--- a/modules/commands/os_kill.cpp
+++ b/modules/commands/os_kill.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSKill : public Command
 {
- public:
+public:
 	CommandOSKill(Module *creator) : Command(creator, "operserv/kill", 1, 2)
 	{
 		this->SetDesc(_("Kill a user"));
@@ -56,7 +56,7 @@ class OSKill : public Module
 {
 	CommandOSKill commandoskill;
 
- public:
+public:
 	OSKill(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoskill(this)
 	{
diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index 163044210..d573e43b8 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSChanList : public Command
 {
- public:
+public:
 	CommandOSChanList(Module *creator) : Command(creator, "operserv/chanlist", 0, 2)
 	{
 		this->SetDesc(_("Lists all channel records"));
@@ -130,7 +130,7 @@ class CommandOSChanList : public Command
 
 class CommandOSUserList : public Command
 {
- public:
+public:
 	CommandOSUserList(Module *creator) : Command(creator, "operserv/userlist", 0, 2)
 	{
 		this->SetDesc(_("Lists all user records"));
@@ -275,7 +275,7 @@ class OSList : public Module
 	CommandOSChanList commandoschanlist;
 	CommandOSUserList commandosuserlist;
 
- public:
+public:
 	OSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoschanlist(this), commandosuserlist(this)
 	{
diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp
index 023f1cfe8..cf9283121 100644
--- a/modules/commands/os_login.cpp
+++ b/modules/commands/os_login.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSLogin : public Command
 {
- public:
+public:
 	CommandOSLogin(Module *creator) : Command(creator, "operserv/login", 1, 1)
 	{
 		this->SetSyntax(_("\037password\037"));
@@ -63,7 +63,7 @@ class CommandOSLogin : public Command
 
 class CommandOSLogout : public Command
 {
- public:
+public:
 	CommandOSLogout(Module *creator) : Command(creator, "operserv/logout", 0, 0)
 	{
 		this->RequireUser(true);
@@ -109,7 +109,7 @@ class OSLogin : public Module
 	CommandOSLogout commandoslogout;
 	ExtensibleItem<bool> os_login;
 
- public:
+public:
 	OSLogin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoslogin(this), commandoslogout(this), os_login(this, "os_login")
 	{
diff --git a/modules/commands/os_logsearch.cpp b/modules/commands/os_logsearch.cpp
index ecea323c5..c16f33a1e 100644
--- a/modules/commands/os_logsearch.cpp
+++ b/modules/commands/os_logsearch.cpp
@@ -26,7 +26,7 @@ class CommandOSLogSearch : public Command
 		return Anope::LogDir + "/" + file + "." + timestamp;
 	}
 
- public:
+public:
 	CommandOSLogSearch(Module *creator) : Command(creator, "operserv/logsearch", 1, 3)
 	{
 		this->SetDesc(_("Searches logs for a matching pattern"));
@@ -175,7 +175,7 @@ class OSLogSearch : public Module
 {
 	CommandOSLogSearch commandoslogsearch;
 
- public:
+public:
 	OSLogSearch(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandoslogsearch(this)
 	{
diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp
index 096f50118..05f1e8a5c 100644
--- a/modules/commands/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSMode : public Command
 {
- public:
+public:
 	CommandOSMode(Module *creator) : Command(creator, "operserv/mode", 2, 3)
 	{
 		this->SetDesc(_("Change channel modes"));
@@ -137,7 +137,7 @@ class CommandOSMode : public Command
 
 class CommandOSUMode : public Command
 {
- public:
+public:
 	CommandOSUMode(Module *creator) : Command(creator, "operserv/umode", 2, 2)
 	{
 		this->SetDesc(_("Change user modes"));
@@ -178,7 +178,7 @@ class OSMode : public Module
 	CommandOSMode commandosmode;
 	CommandOSUMode commandosumode;
 
- public:
+public:
 	OSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosmode(this), commandosumode(this)
 	{
diff --git a/modules/commands/os_modinfo.cpp b/modules/commands/os_modinfo.cpp
index 5d6de2e6c..1c837bb64 100644
--- a/modules/commands/os_modinfo.cpp
+++ b/modules/commands/os_modinfo.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSModInfo : public Command
 {
- public:
+public:
 	CommandOSModInfo(Module *creator) : Command(creator, "operserv/modinfo", 1, 1)
 	{
 		this->SetDesc(_("Info about a loaded module"));
@@ -70,7 +70,7 @@ class CommandOSModInfo : public Command
 
 class CommandOSModList : public Command
 {
- public:
+public:
 	CommandOSModList(Module *creator) : Command(creator, "operserv/modlist", 0, 1)
 	{
 		this->SetDesc(_("List loaded modules"));
@@ -197,7 +197,7 @@ class OSModInfo : public Module
 	CommandOSModInfo commandosmodinfo;
 	CommandOSModList commandosmodlist;
 
- public:
+public:
 	OSModInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosmodinfo(this), commandosmodlist(this)
 	{
diff --git a/modules/commands/os_module.cpp b/modules/commands/os_module.cpp
index 7f20132fa..3f13e8f16 100644
--- a/modules/commands/os_module.cpp
+++ b/modules/commands/os_module.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSModLoad : public Command
 {
- public:
+public:
 	CommandOSModLoad(Module *creator) : Command(creator, "operserv/modload", 1, 1)
 	{
 		this->SetDesc(_("Load a module"));
@@ -50,7 +50,7 @@ class CommandOSModLoad : public Command
 
 class CommandOSModReLoad : public Command
 {
- public:
+public:
 	CommandOSModReLoad(Module *creator) : Command(creator, "operserv/modreload", 1, 1)
 	{
 		this->SetDesc(_("Reload a module"));
@@ -122,7 +122,7 @@ class CommandOSModReLoad : public Command
 
 class CommandOSModUnLoad : public Command
 {
- public:
+public:
 	CommandOSModUnLoad(Module *creator) : Command(creator, "operserv/modunload", 1, 1)
 	{
 		this->SetDesc(_("Un-Load a module"));
@@ -176,7 +176,7 @@ class OSModule : public Module
 	CommandOSModReLoad commandosmodreload;
 	CommandOSModUnLoad commandosmodunload;
 
- public:
+public:
 	OSModule(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosmodload(this), commandosmodreload(this), commandosmodunload(this)
 	{
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index 68c9f2629..6b831369e 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -96,7 +96,7 @@ struct MyNewsItem : NewsItem
 class MyNewsService : public NewsService
 {
 	std::vector<NewsItem *> newsItems[3];
- public:
+public:
 	MyNewsService(Module *m) : NewsService(m) { }
 
 	~MyNewsService() override
@@ -146,7 +146,7 @@ class NewsBase : public Command
 {
 	ServiceReference<NewsService> ns;
 
- protected:
+protected:
 	void DoList(CommandSource &source, NewsType ntype, const char **msgs)
 	{
 		std::vector<NewsItem *> &list = this->ns->GetNewsList(ntype);
@@ -274,7 +274,7 @@ class NewsBase : public Command
 
 		return;
 	}
- public:
+public:
 	NewsBase(Module *creator, const Anope::string &newstype) : Command(creator, newstype, 1, 2), ns("NewsService", "news")
 	{
 		this->SetSyntax(_("ADD \037text\037"));
@@ -293,7 +293,7 @@ class NewsBase : public Command
 
 class CommandOSLogonNews : public NewsBase
 {
- public:
+public:
 	CommandOSLogonNews(Module *creator) : NewsBase(creator, "operserv/logonnews")
 	{
 		this->SetDesc(_("Define messages to be shown to users at logon"));
@@ -320,7 +320,7 @@ class CommandOSLogonNews : public NewsBase
 
 class CommandOSOperNews : public NewsBase
 {
- public:
+public:
 	CommandOSOperNews(Module *creator) : NewsBase(creator, "operserv/opernews")
 	{
 		this->SetDesc(_("Define messages to be shown to users who oper"));
@@ -347,7 +347,7 @@ class CommandOSOperNews : public NewsBase
 
 class CommandOSRandomNews : public NewsBase
 {
- public:
+public:
 	CommandOSRandomNews(Module *creator) : NewsBase(creator, "operserv/randomnews")
 	{
 		this->SetDesc(_("Define messages to be randomly shown to users at logon"));
@@ -433,7 +433,7 @@ class OSNews : public Module
 			cur_rand_news = 0;
 	}
 
- public:
+public:
 	OSNews(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		newsservice(this), newsitem_type("NewsItem", MyNewsItem::Unserialize),
 		commandoslogonnews(this), commandosopernews(this), commandosrandomnews(this)
diff --git a/modules/commands/os_noop.cpp b/modules/commands/os_noop.cpp
index 23cf83142..ddfd98819 100644
--- a/modules/commands/os_noop.cpp
+++ b/modules/commands/os_noop.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSNOOP : public Command
 {
- public:
+public:
 	CommandOSNOOP(Module *creator) : Command(creator, "operserv/noop", 2, 2)
 	{
 		this->SetDesc(_("Remove all operators from a server remotely"));
@@ -76,7 +76,7 @@ class OSNOOP : public Module
 	CommandOSNOOP commandosnoop;
 	PrimitiveExtensibleItem<Anope::string> noop;
 
- public:
+public:
 	OSNOOP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosnoop(this), noop(this, "noop")
 	{
diff --git a/modules/commands/os_oper.cpp b/modules/commands/os_oper.cpp
index 67612ea74..f1b628ead 100644
--- a/modules/commands/os_oper.cpp
+++ b/modules/commands/os_oper.cpp
@@ -65,7 +65,7 @@ class CommandOSOper : public Command
 		return true;
 	}
 
- public:
+public:
 	CommandOSOper(Module *creator) : Command(creator, "operserv/oper", 1, 3)
 	{
 		this->SetDesc(_("View and change Services Operators"));
@@ -257,7 +257,7 @@ class OSOper : public Module
 	Serialize::Type myoper_type;
 	CommandOSOper commandosoper;
 
- public:
+public:
 	OSOper(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		myoper_type("Oper", MyOper::Unserialize), commandosoper(this)
 	{
diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp
index 7ae3228e4..c7814b0a0 100644
--- a/modules/commands/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSReload : public Command
 {
- public:
+public:
 	CommandOSReload(Module *creator) : Command(creator, "operserv/reload", 0, 0)
 	{
 		this->SetDesc(_("Reload services' configuration file"));
@@ -56,7 +56,7 @@ class OSReload : public Module
 {
 	CommandOSReload commandosreload;
 
- public:
+public:
 	OSReload(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosreload(this)
 	{
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index 07e1e551f..8ce90dc8a 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -39,7 +39,7 @@ class MySessionService : public SessionService
 {
 	SessionMap Sessions;
 	Serialize::Checker<ExceptionVector> Exceptions;
- public:
+public:
 	MySessionService(Module *m) : SessionService(m), Exceptions("Exception") { }
 
 	Exception *CreateException() override
@@ -128,11 +128,11 @@ class MySessionService : public SessionService
 
 class ExceptionDelCallback : public NumberList
 {
- protected:
+protected:
 	CommandSource &source;
 	unsigned deleted = 0;
 	Command *cmd;
- public:
+public:
 	ExceptionDelCallback(CommandSource &_source, const Anope::string &numlist, Command *c) : NumberList(numlist, true), source(_source), cmd(c)
 	{
 	}
@@ -170,7 +170,7 @@ class ExceptionDelCallback : public NumberList
 
 class CommandOSSession : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source, const std::vector<Anope::string> &params)
 	{
 		Anope::string param = params[1];
@@ -235,7 +235,7 @@ class CommandOSSession : public Command
 		else
 			source.Reply(_("The host \002%s\002 currently has \002%d\002 sessions with a limit of \002%d\002 because it matches entry: \002%s\002."), session->addr.mask().c_str(), session->count, limit, entry.c_str());
 	}
- public:
+public:
 	CommandOSSession(Module *creator) : Command(creator, "operserv/session", 2, 2)
 	{
 		this->SetDesc(_("View the list of host sessions"));
@@ -283,7 +283,7 @@ class CommandOSSession : public Command
 
 class CommandOSException : public Command
 {
- private:
+private:
 	void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
 	{
 		Anope::string mask, expiry, limitstr;
@@ -435,7 +435,7 @@ class CommandOSException : public Command
 			{
 				CommandSource &source;
 				ListFormatter &list;
-			 public:
+			public:
 				ExceptionListCallback(CommandSource &_source, ListFormatter &_list, const Anope::string &numlist) : NumberList(numlist, false), source(_source), list(_list)
 				{
 				}
@@ -511,7 +511,7 @@ class CommandOSException : public Command
 		this->ProcessList(source, params, list);
 	}
 
- public:
+public:
 	CommandOSException(Module *creator) : Command(creator, "operserv/exception", 1, 5)
 	{
 		this->SetDesc(_("Modify the session-limit exception list"));
@@ -585,7 +585,7 @@ class OSSession : public Module
 	CommandOSException commandosexception;
 	ServiceReference<XLineManager> akills;
 
- public:
+public:
 	OSSession(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		exception_type("Exception", Exception::Unserialize), ss(this), commandossession(this), commandosexception(this), akills("XLineManager", "xlinemanager/sgline")
 	{
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp
index 51d9788d4..5d95149f0 100644
--- a/modules/commands/os_set.cpp
+++ b/modules/commands/os_set.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSSet : public Command
 {
- private:
+private:
 	void DoList(CommandSource &source)
 	{
 		Log(LOG_ADMIN, source, this) << "LIST";
@@ -163,7 +163,7 @@ class CommandOSSet : public Command
 
 		return;
 	}
- public:
+public:
 	CommandOSSet(Module *creator) : Command(creator, "operserv/set", 1, 2)
 	{
 		this->SetDesc(_("Set various global services options"));
@@ -257,7 +257,7 @@ class OSSet : public Module
 {
 	CommandOSSet commandosset;
 
- public:
+public:
 	OSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosset(this)
 	{
diff --git a/modules/commands/os_shutdown.cpp b/modules/commands/os_shutdown.cpp
index fbd9fd5e3..477d4d307 100644
--- a/modules/commands/os_shutdown.cpp
+++ b/modules/commands/os_shutdown.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSQuit : public Command
 {
- public:
+public:
 	CommandOSQuit(Module *creator) : Command(creator, "operserv/quit", 0, 0)
 	{
 		this->SetDesc(_("Terminate services WITHOUT saving"));
@@ -41,7 +41,7 @@ class CommandOSQuit : public Command
 
 class CommandOSRestart : public Command
 {
- public:
+public:
 	CommandOSRestart(Module *creator) : Command(creator, "operserv/restart", 0, 0)
 	{
 		this->SetDesc(_("Save databases and restart Services"));
@@ -67,7 +67,7 @@ class CommandOSRestart : public Command
 
 class CommandOSShutdown : public Command
 {
- public:
+public:
 	CommandOSShutdown(Module *creator) : Command(creator, "operserv/shutdown", 0, 0)
 	{
 		this->SetDesc(_("Terminate services with save"));
@@ -97,7 +97,7 @@ class OSShutdown : public Module
 	CommandOSRestart commandosrestart;
 	CommandOSShutdown commandosshutdown;
 
- public:
+public:
 	OSShutdown(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosquit(this), commandosrestart(this), commandosshutdown(this)
 	{
diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp
index 2fe23ddaf..4b84875ed 100644
--- a/modules/commands/os_stats.cpp
+++ b/modules/commands/os_stats.cpp
@@ -61,7 +61,7 @@ static int stats_count_servers(Server *s)
 class CommandOSStats : public Command
 {
 	ServiceReference<XLineManager> akills, snlines, sqlines;
- private:
+private:
 	void DoStatsAkill(CommandSource &source)
 	{
 		int timeout;
@@ -198,7 +198,7 @@ class CommandOSStats : public Command
 		}
 	}
 
- public:
+public:
 	CommandOSStats(Module *creator) : Command(creator, "operserv/stats", 0, 1),
 		akills("XLineManager", "xlinemanager/sgline"), snlines("XLineManager", "xlinemanager/snline"), sqlines("XLineManager", "xlinemanager/sqline")
 	{
@@ -261,7 +261,7 @@ class OSStats : public Module
 	Serialize::Type stats_type;
 	Stats stats_saver;
 
- public:
+public:
 	OSStats(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosstats(this), stats_type("Stats", Stats::Unserialize)
 	{
diff --git a/modules/commands/os_svs.cpp b/modules/commands/os_svs.cpp
index 8ac228270..804b74219 100644
--- a/modules/commands/os_svs.cpp
+++ b/modules/commands/os_svs.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSSVSNick : public Command
 {
- public:
+public:
 	CommandOSSVSNick(Module *creator) : Command(creator, "operserv/svsnick", 2, 2)
 	{
 		this->SetDesc(_("Forcefully change a user's nickname"));
@@ -72,7 +72,7 @@ class CommandOSSVSNick : public Command
 
 class CommandOSSVSJoin : public Command
 {
- public:
+public:
 	CommandOSSVSJoin(Module *creator) : Command(creator, "operserv/svsjoin", 2, 2)
 	{
 		this->SetDesc(_("Forcefully join a user to a channel"));
@@ -116,7 +116,7 @@ class CommandOSSVSJoin : public Command
 
 class CommandOSSVSPart : public Command
 {
- public:
+public:
 	CommandOSSVSPart(Module *creator) : Command(creator, "operserv/svspart", 2, 3)
 	{
 		this->SetDesc(_("Forcefully part a user from a channel"));
@@ -168,7 +168,7 @@ class OSSVS : public Module
 	CommandOSSVSJoin commandossvsjoin;
 	CommandOSSVSPart commandossvspart;
 
- public:
+public:
 	OSSVS(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandossvsnick(this), commandossvsjoin(this), commandossvspart(this)
 	{
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index f08b64933..09a005ae4 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -17,7 +17,7 @@ class SXLineDelCallback : public NumberList
 	Command *command;
 	CommandSource &source;
 	unsigned deleted = 0;
- public:
+public:
 	SXLineDelCallback(XLineManager *x, Command *c, CommandSource &_source, const Anope::string &numlist) : NumberList(numlist, true), xlm(x), command(c), source(_source)
 	{
 	}
@@ -56,7 +56,7 @@ class SXLineDelCallback : public NumberList
 
 class CommandOSSXLineBase : public Command
 {
- private:
+private:
 	virtual XLineManager* xlm() = 0;
 
 	virtual void OnAdd(CommandSource &source, const std::vector<Anope::string> &params) = 0;
@@ -123,7 +123,7 @@ class CommandOSSXLineBase : public Command
 				XLineManager *xlm;
 				CommandSource &source;
 				ListFormatter &list;
-			 public:
+			public:
 				SXLineListCallback(XLineManager *x, CommandSource &_source, ListFormatter &_list, const Anope::string &numlist) : NumberList(numlist, false), xlm(x), source(_source), list(_list)
 				{
 				}
@@ -223,7 +223,7 @@ class CommandOSSXLineBase : public Command
 
 		return;
 	}
- public:
+public:
 	CommandOSSXLineBase(Module *creator, const Anope::string &cmd) : Command(creator, cmd, 1, 4)
 	{
 	}
@@ -417,7 +417,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 	}
 
 	ServiceReference<XLineManager> snlines;
- public:
+public:
 	CommandOSSNLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/snline"), snlines("XLineManager", "xlinemanager/snline")
 	{
 		this->SetSyntax(_("ADD [+\037expiry\037] \037mask\037:\037reason\037"));
@@ -646,7 +646,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
 	}
 
 	ServiceReference<XLineManager> sqlines;
- public:
+public:
 	CommandOSSQLine(Module *creator) : CommandOSSXLineBase(creator, "operserv/sqline"), sqlines("XLineManager", "xlinemanager/sqline")
 	{
 		this->SetSyntax(_("ADD [+\037expiry\037] \037mask\037 \037reason\037"));
@@ -715,7 +715,7 @@ class OSSXLine : public Module
 	CommandOSSNLine commandossnline;
 	CommandOSSQLine commandossqline;
 
- public:
+public:
 	OSSXLine(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandossnline(this), commandossqline(this)
 	{
diff --git a/modules/commands/os_update.cpp b/modules/commands/os_update.cpp
index 1b88e4b0d..4d0a625f9 100644
--- a/modules/commands/os_update.cpp
+++ b/modules/commands/os_update.cpp
@@ -13,7 +13,7 @@
 
 class CommandOSUpdate : public Command
 {
- public:
+public:
 	CommandOSUpdate(Module *creator) : Command(creator, "operserv/update", 0, 0)
 	{
 		this->SetDesc(_("Force the services databases to be updated immediately"));
@@ -41,7 +41,7 @@ class OSUpdate : public Module
 {
 	CommandOSUpdate commandosupdate;
 
- public:
+public:
 	OSUpdate(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandosupdate(this)
 	{
diff --git a/modules/cs_statusupdate.cpp b/modules/cs_statusupdate.cpp
index c871489fc..60e321af3 100644
--- a/modules/cs_statusupdate.cpp
+++ b/modules/cs_statusupdate.cpp
@@ -10,7 +10,7 @@
 
 class StatusUpdate : public Module
 {
- public:
+public:
 	StatusUpdate(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
 	{
 
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 7841a57cf..83eadd998 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -17,7 +17,7 @@
 
 class SaveData : public Serialize::Data
 {
- public:
+public:
 	Anope::string last;
 	std::fstream *fs = nullptr;
 
@@ -35,7 +35,7 @@ class SaveData : public Serialize::Data
 
 class LoadData : public Serialize::Data
 {
- public:
+public:
 	std::fstream *fs = nullptr;
 	unsigned int id = 0;
 	std::map<Anope::string, Anope::string> data;
@@ -165,7 +165,7 @@ class DBFlatFile : public Module, public Pipe
 		}
 	}
 
- public:
+public:
 	DBFlatFile(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR)
 	{
 
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index f8663b395..9f188450f 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -1302,7 +1302,7 @@ class DBOld : public Module
 	PrimitiveExtensibleItem<uint32_t> mlock_on, mlock_off, mlock_limit;
 	PrimitiveExtensibleItem<Anope::string> mlock_key;
 
- public:
+public:
 	DBOld(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR),
 		mlock_on(this, "mlock_on"), mlock_off(this, "mlock_off"), mlock_limit(this, "mlock_limit"), mlock_key(this, "mlock_key")
 	{
diff --git a/modules/database/db_redis.cpp b/modules/database/db_redis.cpp
index 4c90d179d..ac5cae3d9 100644
--- a/modules/database/db_redis.cpp
+++ b/modules/database/db_redis.cpp
@@ -16,7 +16,7 @@ static DatabaseRedis *me;
 
 class Data : public Serialize::Data
 {
- public:
+public:
 	std::map<Anope::string, std::stringstream *> data;
 
 	~Data() override
@@ -54,7 +54,7 @@ class Data : public Serialize::Data
 class TypeLoader : public Interface
 {
 	Anope::string type;
- public:
+public:
 	TypeLoader(Module *creator, const Anope::string &t) : Interface(creator), type(t) { }
 
 	void OnResult(const Reply &r) override;
@@ -65,7 +65,7 @@ class ObjectLoader : public Interface
 	Anope::string type;
 	int64_t id;
 
- public:
+public:
 	ObjectLoader(Module *creator, const Anope::string &t, int64_t i) : Interface(creator), type(t), id(i) { }
 
 	void OnResult(const Reply &r) override;
@@ -74,7 +74,7 @@ class ObjectLoader : public Interface
 class IDInterface : public Interface
 {
 	Reference<Serializable> o;
- public:
+public:
 	IDInterface(Module *creator, Serializable *obj) : Interface(creator), o(obj) { }
 
 	void OnResult(const Reply &r) override;
@@ -84,7 +84,7 @@ class Deleter : public Interface
 {
 	Anope::string type;
 	int64_t id;
- public:
+public:
 	Deleter(Module *creator, const Anope::string &t, int64_t i) : Interface(creator), type(t), id(i) { }
 
 	void OnResult(const Reply &r) override;
@@ -94,7 +94,7 @@ class Updater : public Interface
 {
 	Anope::string type;
 	int64_t id;
- public:
+public:
 	Updater(Module *creator, const Anope::string &t, int64_t i) : Interface(creator), type(t), id(i) { }
 
 	void OnResult(const Reply &r) override;
@@ -104,7 +104,7 @@ class ModifiedObject : public Interface
 {
 	Anope::string type;
 	int64_t id;
- public:
+public:
 	ModifiedObject(Module *creator, const Anope::string &t, int64_t i) : Interface(creator), type(t), id(i) { }
 
 	void OnResult(const Reply &r) override;
@@ -112,7 +112,7 @@ class ModifiedObject : public Interface
 
 class SubscriptionListener : public Interface
 {
- public:
+public:
 	SubscriptionListener(Module *creator) : Interface(creator) { }
 
 	void OnResult(const Reply &r) override;
@@ -123,7 +123,7 @@ class DatabaseRedis : public Module, public Pipe
 	SubscriptionListener sl;
 	std::set<Serializable *> updated_items;
 
- public:
+public:
 	ServiceReference<Provider> redis;
 
 	DatabaseRedis(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), sl(this)
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index f508c1615..2e771557d 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -16,7 +16,7 @@ using namespace SQL;
 
 class SQLSQLInterface : public Interface
 {
- public:
+public:
 	SQLSQLInterface(Module *o) : Interface(o) { }
 
 	void OnResult(const Result &r) override
@@ -89,7 +89,7 @@ class DBSQL : public Module, public Pipe
 			this->sql->RunQuery(q);
 	}
 
- public:
+public:
 	DBSQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), sql("", ""), sqlinterface(this)
 	{
 
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index 825628127..8c74ee778 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -13,7 +13,7 @@ using namespace SQL;
 
 class DBMySQL : public Module, public Pipe
 {
- private:
+private:
 	Anope::string prefix;
 	ServiceReference<Provider> SQL;
 	time_t lastwarn;
@@ -71,7 +71,7 @@ class DBMySQL : public Module, public Pipe
 		throw SQL::Exception("No SQL!");
 	}
 
- public:
+public:
 	DBMySQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), SQL("", "")
 	{
 		this->lastwarn = 0;
diff --git a/modules/encryption/enc_bcrypt.cpp b/modules/encryption/enc_bcrypt.cpp
index 94c6fc164..653f28d7b 100644
--- a/modules/encryption/enc_bcrypt.cpp
+++ b/modules/encryption/enc_bcrypt.cpp
@@ -45,7 +45,7 @@ class EBCRYPT : public Module
 		return (ret == hash);
 	}
 
- public:
+public:
 	EBCRYPT(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR),
 		rounds(10)
 	{
diff --git a/modules/encryption/enc_md5.cpp b/modules/encryption/enc_md5.cpp
index 1fb12692a..25d33e0a6 100644
--- a/modules/encryption/enc_md5.cpp
+++ b/modules/encryption/enc_md5.cpp
@@ -227,7 +227,7 @@ class MD5Context : public Encryption::Context
 			output[i] = static_cast<unsigned>(input[j]) | (static_cast<unsigned>(input[j + 1]) << 8) | (static_cast<unsigned>(input[j + 2]) << 16) | (static_cast<unsigned>(input[j + 3]) << 24);
 	}
 
- public:
+public:
 	MD5Context(Encryption::IV *iv = NULL)
 	{
 		if (iv != NULL)
@@ -320,7 +320,7 @@ class MD5Context : public Encryption::Context
 
 class MD5Provider : public Encryption::Provider
 {
- public:
+public:
 	MD5Provider(Module *creator) : Encryption::Provider(creator, "md5") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) override
@@ -341,7 +341,7 @@ class EMD5 : public Module
 {
 	MD5Provider md5provider;
 
- public:
+public:
 	EMD5(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR),
 		md5provider(this)
 	{
diff --git a/modules/encryption/enc_none.cpp b/modules/encryption/enc_none.cpp
index f91997b1c..4a5a96320 100644
--- a/modules/encryption/enc_none.cpp
+++ b/modules/encryption/enc_none.cpp
@@ -11,7 +11,7 @@
 
 class ENone : public Module
 {
- public:
+public:
 	ENone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR)
 	{
 		if (ModuleManager::FindFirstOf(ENCRYPTION) == this)
diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp
index a0fc224c8..6d0b09068 100644
--- a/modules/encryption/enc_old.cpp
+++ b/modules/encryption/enc_old.cpp
@@ -16,7 +16,7 @@ static ServiceReference<Encryption::Provider> md5("Encryption::Provider", "md5")
 
 class OldMD5Provider : public Encryption::Provider
 {
- public:
+public:
 	OldMD5Provider(Module *creator) : Encryption::Provider(creator, "oldmd5") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) override
@@ -40,7 +40,7 @@ class EOld : public Module
 
 	inline static char XTOI(char c) { return c > 9 ? c - 'A' + 10 : c - '0'; }
 
- public:
+public:
 	EOld(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR),
 		oldmd5provider(this)
 	{
diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp
index 0ddfcded0..b24c4bd83 100644
--- a/modules/encryption/enc_sha1.cpp
+++ b/modules/encryption/enc_sha1.cpp
@@ -106,7 +106,7 @@ class SHA1Context : public Encryption::Context
 		a = b = c = d = e = 0;
 	}
 
- public:
+public:
 	SHA1Context(Encryption::IV *iv = NULL)
 	{
 		if (iv != NULL)
@@ -180,7 +180,7 @@ class SHA1Context : public Encryption::Context
 
 class SHA1Provider : public Encryption::Provider
 {
- public:
+public:
 	SHA1Provider(Module *creator) : Encryption::Provider(creator, "sha1") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) override
@@ -201,7 +201,7 @@ class ESHA1 : public Module
 {
 	SHA1Provider sha1provider;
 
- public:
+public:
 	ESHA1(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR),
 		sha1provider(this)
 	{
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index d5cebcb74..71950a32e 100644
--- a/modules/encryption/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
@@ -152,7 +152,7 @@ class SHA256Context : public Encryption::Context
 	uint32_t h[8];
 	unsigned char digest[SHA256_DIGEST_SIZE];
 
- public:
+public:
 	SHA256Context(Encryption::IV *iv)
 	{
 		if (iv != NULL)
@@ -218,7 +218,7 @@ class SHA256Context : public Encryption::Context
 
 class SHA256Provider : public Encryption::Provider
 {
- public:
+public:
 	SHA256Provider(Module *creator) : Encryption::Provider(creator, "sha256") { }
 
 	Encryption::Context *CreateContext(Encryption::IV *iv) override
@@ -271,7 +271,7 @@ class ESHA256 : public Module
 			PACK32(reinterpret_cast<unsigned char *>(&buf2[i << 2]), iv[i]);
 	}
 
- public:
+public:
 	ESHA256(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR),
 		sha256provider(this)
 	{
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp
index a92385c7d..73520e553 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/m_ldap.cpp
@@ -44,7 +44,7 @@ static Pipe *me;
 
 class LDAPRequest
 {
- public:
+public:
 	LDAPService *service;
 	LDAPInterface *inter;
 	LDAPMessage *message = nullptr; /* message returned by ldap_ */
@@ -76,7 +76,7 @@ class LDAPBind : public LDAPRequest
 {
 	Anope::string who, pass;
 
- public:
+public:
 	LDAPBind(LDAPService *s, LDAPInterface *i, const Anope::string &w, const Anope::string &p)
 		: LDAPRequest(s, i)
 		, who(w)
@@ -93,7 +93,7 @@ class LDAPSearchRequest : public LDAPRequest
 	Anope::string base;
 	Anope::string filter;
 
- public:
+public:
 	LDAPSearchRequest(LDAPService *s, LDAPInterface *i, const Anope::string &b, const Anope::string &f)
 		: LDAPRequest(s, i)
 		, base(b)
@@ -110,7 +110,7 @@ class LDAPAdd : public LDAPRequest
 	Anope::string dn;
 	LDAPMods attributes;
 
- public:
+public:
 	LDAPAdd(LDAPService *s, LDAPInterface *i, const Anope::string &d, const LDAPMods &attr)
 		: LDAPRequest(s, i)
 		, dn(d)
@@ -126,7 +126,7 @@ class LDAPDel : public LDAPRequest
 {
 	Anope::string dn;
 
- public:
+public:
 	LDAPDel(LDAPService *s, LDAPInterface *i, const Anope::string &d)
 		: LDAPRequest(s, i)
 		, dn(d)
@@ -142,7 +142,7 @@ class LDAPModify : public LDAPRequest
 	Anope::string base;
 	LDAPMods attributes;
 
- public:
+public:
 	LDAPModify(LDAPService *s, LDAPInterface *i, const Anope::string &b, const LDAPMods &attr)
 		: LDAPRequest(s, i)
 		, base(b)
@@ -164,7 +164,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition
 
 	time_t last_connect = 0;
 
- public:
+public:
 	static LDAPMod **BuildMods(const LDAPMods &attributes)
 	{
 		LDAPMod **mods = new LDAPMod*[attributes.size() + 1];
@@ -204,7 +204,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition
 		delete [] mods;
 	}
 
- private:
+private:
 #ifdef _WIN32
 	// Windows LDAP does not implement this so we need to do it.
 	int ldap_initialize(LDAP** ldap, const char* url)
@@ -299,7 +299,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition
 		this->Unlock();
 	}
 
- public:
+public:
 	typedef std::vector<LDAPRequest *> query_queue;
 	query_queue queries, results;
 	Mutex process_mutex; /* held when processing requests not in either queue */
@@ -381,7 +381,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition
 		QueueRequest(mod);
 	}
 
- private:
+private:
 	void BuildReply(int res, LDAPRequest *req)
 	{
 		LDAPResult *ldap_result = req->result = new LDAPResult();
@@ -480,7 +480,7 @@ class LDAPService : public LDAPProvider, public Thread, public Condition
 		process_mutex.Unlock();
 	}
 
- public:
+public:
 	void Run() override
 	{
 		while (!this->GetExitState())
@@ -505,7 +505,7 @@ class ModuleLDAP : public Module, public Pipe
 {
 	std::map<Anope::string, LDAPService *> LDAPServices;
 
- public:
+public:
 
 	ModuleLDAP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index d49daf284..cb6a984fd 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -40,7 +40,7 @@ class IdentifyInterface : public LDAPInterface
 {
 	IdentifyInfo *ii;
 
- public:
+public:
 	IdentifyInterface(Module *m, IdentifyInfo *i) : LDAPInterface(m), ii(i) { }
 
 	~IdentifyInterface()
@@ -131,7 +131,7 @@ class OnIdentifyInterface : public LDAPInterface
 {
 	Anope::string uid;
 
- public:
+public:
 	OnIdentifyInterface(Module *m, const Anope::string &i) : LDAPInterface(m), uid(i) { }
 
 	void OnDelete() override
@@ -174,7 +174,7 @@ class OnIdentifyInterface : public LDAPInterface
 
 class OnRegisterInterface : public LDAPInterface
 {
- public:
+public:
 	OnRegisterInterface(Module *m) : LDAPInterface(m) { }
 
 	void OnResult(const LDAPResult &r) override
@@ -198,7 +198,7 @@ class ModuleLDAPAuthentication : public Module
 	Anope::string password_attribute;
 	Anope::string disable_register_reason;
 	Anope::string disable_email_reason;
- public:
+public:
 	ModuleLDAPAuthentication(const Anope::string &modname, const Anope::string &creator) :
 		Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main"), orinterface(this),
 		dn(this, "m_ldap_authentication_dn")
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index 0a3c2c71a..744979096 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -16,7 +16,7 @@ class IdentifyInterface : public LDAPInterface
 {
 	Reference<User> u;
 
- public:
+public:
 	IdentifyInterface(Module *m, User *user) : LDAPInterface(m), u(user)
 	{
 	}
@@ -83,7 +83,7 @@ class LDAPOper : public Module
 	Anope::string password;
 	Anope::string basedn;
 	Anope::string filter;
- public:
+public:
 	LDAPOper(const Anope::string &modname, const Anope::string &creator) :
 		Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main")
 	{
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp
index 0ec7f8989..45a8793b0 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/m_mysql.cpp
@@ -63,7 +63,7 @@ class MySQLResult : public Result
 {
 	MYSQL_RES *res = nullptr;
 
- public:
+public:
 	MySQLResult(unsigned int i, const Query &q, const Anope::string &fq, MYSQL_RES *r) : Result(i, q, fq), res(r)
 	{
 		unsigned num_fields = res ? mysql_num_fields(res) : 0;
@@ -124,7 +124,7 @@ class MySQLService : public Provider
 	 */
 	Anope::string Escape(const Anope::string &query);
 
- public:
+public:
 	/* Locked by the SQL thread when a query is pending on this database,
 	 * prevents us from deleting a connection while a query is executing
 	 * in the thread
@@ -158,7 +158,7 @@ class MySQLService : public Provider
  */
 class DispatcherThread : public Thread, public Condition
 {
- public:
+public:
 	DispatcherThread() : Thread() { }
 
 	void Run() override;
@@ -170,7 +170,7 @@ class ModuleSQL : public Module, public Pipe
 {
 	/* SQL connections */
 	std::map<Anope::string, MySQLService *> MySQLServices;
- public:
+public:
 	/* Pending query requests */
 	std::deque<QueryRequest> QueryRequests;
 	/* Pending finished requests with results */
diff --git a/modules/extra/m_regex_pcre2.cpp b/modules/extra/m_regex_pcre2.cpp
index 2d2be3916..062cc7bcc 100644
--- a/modules/extra/m_regex_pcre2.cpp
+++ b/modules/extra/m_regex_pcre2.cpp
@@ -18,7 +18,7 @@ class PCRERegex : public Regex
 {
 	pcre2_code *regex;
 
- public:
+public:
 	PCRERegex(const Anope::string &expr) : Regex(expr)
 	{
 		int errcode;
@@ -49,7 +49,7 @@ class PCRERegex : public Regex
 
 class PCRERegexProvider : public RegexProvider
 {
- public:
+public:
 	PCRERegexProvider(Module *creator) : RegexProvider(creator, "regex/pcre") { }
 
 	Regex *Compile(const Anope::string &expression) override
@@ -62,7 +62,7 @@ class ModuleRegexPCRE : public Module
 {
 	PCRERegexProvider pcre_regex_provider;
 
- public:
+public:
 	ModuleRegexPCRE(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		pcre_regex_provider(this)
 	{
diff --git a/modules/extra/m_regex_posix.cpp b/modules/extra/m_regex_posix.cpp
index add8ab084..883375f7f 100644
--- a/modules/extra/m_regex_posix.cpp
+++ b/modules/extra/m_regex_posix.cpp
@@ -14,7 +14,7 @@ class POSIXRegex : public Regex
 {
 	regex_t regbuf;
 
- public:
+public:
 	POSIXRegex(const Anope::string &expr) : Regex(expr)
 	{
 		int err = regcomp(&this->regbuf, expr.c_str(), REG_EXTENDED | REG_NOSUB | REG_ICASE);
@@ -40,7 +40,7 @@ class POSIXRegex : public Regex
 
 class POSIXRegexProvider : public RegexProvider
 {
- public:
+public:
 	POSIXRegexProvider(Module *creator) : RegexProvider(creator, "regex/posix") { }
 
 	Regex *Compile(const Anope::string &expression) override
@@ -53,7 +53,7 @@ class ModuleRegexPOSIX : public Module
 {
 	POSIXRegexProvider posix_regex_provider;
 
- public:
+public:
 	ModuleRegexPOSIX(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		posix_regex_provider(this)
 	{
diff --git a/modules/extra/m_regex_tre.cpp b/modules/extra/m_regex_tre.cpp
index 4ff111b6a..fe564246f 100644
--- a/modules/extra/m_regex_tre.cpp
+++ b/modules/extra/m_regex_tre.cpp
@@ -15,7 +15,7 @@ class TRERegex : public Regex
 {
 	regex_t regbuf;
 
- public:
+public:
 	TRERegex(const Anope::string &expr) : Regex(expr)
 	{
 		int err = regcomp(&this->regbuf, expr.c_str(), REG_EXTENDED | REG_NOSUB);
@@ -41,7 +41,7 @@ class TRERegex : public Regex
 
 class TRERegexProvider : public RegexProvider
 {
- public:
+public:
 	TRERegexProvider(Module *creator) : RegexProvider(creator, "regex/tre") { }
 
 	Regex *Compile(const Anope::string &expression) override
@@ -54,7 +54,7 @@ class ModuleRegexTRE : public Module
 {
 	TRERegexProvider tre_regex_provider;
 
- public:
+public:
 	ModuleRegexTRE(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		tre_regex_provider(this)
 	{
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/m_sql_authentication.cpp
index 77bd8b3ca..7b1334907 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/m_sql_authentication.cpp
@@ -16,7 +16,7 @@ class SQLAuthenticationResult : public SQL::Interface
 	Reference<User> user;
 	IdentifyRequest *req;
 
- public:
+public:
 	SQLAuthenticationResult(User *u, IdentifyRequest *r) : SQL::Interface(me), user(u), req(r)
 	{
 		req->Hold(me);
@@ -81,7 +81,7 @@ class ModuleSQLAuthentication : public Module
 
 	ServiceReference<SQL::Provider> SQL;
 
- public:
+public:
 	ModuleSQLAuthentication(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
 		me = this;
diff --git a/modules/extra/m_sql_log.cpp b/modules/extra/m_sql_log.cpp
index e64b0ebd4..725afb933 100644
--- a/modules/extra/m_sql_log.cpp
+++ b/modules/extra/m_sql_log.cpp
@@ -14,7 +14,7 @@ class SQLLog : public Module
 	std::set<Anope::string> inited;
 	Anope::string table;
 
- public:
+public:
 	SQLLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR | EXTRA)
 	{
 	}
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp
index 4be312459..12082b514 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/m_sql_oper.cpp
@@ -39,7 +39,7 @@ class SQLOperResult : public SQL::Interface
 		}
 	}
 
- public:
+public:
 	SQLOperResult(Module *m, User *u) : SQL::Interface(m), user(u) { }
 
 	void OnResult(const SQL::Result &r) override
@@ -130,7 +130,7 @@ class ModuleSQLOper : public Module
 
 	ServiceReference<SQL::Provider> SQL;
 
- public:
+public:
 	ModuleSQLOper(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
 	}
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index 28c9d6ed5..c64d42a8d 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -21,7 +21,7 @@ using namespace SQL;
  */
 class SQLiteResult : public Result
 {
- public:
+public:
 	SQLiteResult(unsigned int i, const Query &q, const Anope::string &fq) : Result(i, q, fq)
 	{
 	}
@@ -48,7 +48,7 @@ class SQLiteService : public Provider
 
 	Anope::string Escape(const Anope::string &query);
 
- public:
+public:
 	SQLiteService(Module *o, const Anope::string &n, const Anope::string &d);
 
 	~SQLiteService();
@@ -72,7 +72,7 @@ class ModuleSQLite : public Module
 {
 	/* SQL connections */
 	std::map<Anope::string, SQLiteService *> SQLiteServices;
- public:
+public:
 	ModuleSQLite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
 	}
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp
index baa4c977c..1d31cc80e 100644
--- a/modules/extra/m_ssl_gnutls.cpp
+++ b/modules/extra/m_ssl_gnutls.cpp
@@ -24,7 +24,7 @@ namespace GnuTLS { class X509CertCredentials; }
 
 class MySSLService : public SSLService
 {
- public:
+public:
 	MySSLService(Module *o, const Anope::string &n);
 
 	/** Initialize a socket to use SSL
@@ -35,7 +35,7 @@ class MySSLService : public SSLService
 
 class SSLSocketIO : public SocketIO
 {
- public:
+public:
 	gnutls_session_t sess = nullptr;
 	GnuTLS::X509CertCredentials* mycreds;
 
@@ -92,7 +92,7 @@ namespace GnuTLS
 {
 	class Init
 	{
-	 public:
+	public:
 		Init() { gnutls_global_init(); }
 		~Init() { gnutls_global_deinit(); }
 	};
@@ -103,7 +103,7 @@ namespace GnuTLS
 	{
 		gnutls_datum_t datum;
 
-	 public:
+	public:
 		Datum(const Anope::string &dat)
 		{
 			datum.data = reinterpret_cast<unsigned char *>(const_cast<char *>(dat.data()));
@@ -117,7 +117,7 @@ namespace GnuTLS
 	{
 		gnutls_dh_params_t dh_params = nullptr;
 
-	 public:
+	public:
 		void Import(const Anope::string &dhstr)
 		{
 			if (dh_params != NULL)
@@ -154,7 +154,7 @@ namespace GnuTLS
 		 */
 		class RAIIKey
 		{
-		 public:
+		public:
 			gnutls_x509_privkey_t key;
 
 			RAIIKey()
@@ -170,7 +170,7 @@ namespace GnuTLS
 			}
 		} key;
 
-	 public:
+	public:
 		/** Import */
 		X509Key(const Anope::string &keystr)
 		{
@@ -186,7 +186,7 @@ namespace GnuTLS
 	{
 		std::vector<gnutls_x509_crt_t> certs;
 
-	 public:
+	public:
 		/** Import */
 		X509CertList(const Anope::string &certstr)
 		{
@@ -240,7 +240,7 @@ namespace GnuTLS
 		static int cert_callback(gnutls_session_t sess, const gnutls_datum_t* req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t* sign_algos, int sign_algos_length, gnutls_retr2_st* st);
 		#endif
 
-	 public:
+	public:
 		X509CertList certs;
 		X509Key key;
 
@@ -296,7 +296,7 @@ class GnuTLSModule : public Module
 {
 	GnuTLS::Init libinit;
 
- public:
+public:
 	GnuTLS::X509CertCredentials *cred = nullptr;
 	MySSLService service;
 
diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp
index 1b504c122..260fa4be5 100644
--- a/modules/extra/m_ssl_openssl.cpp
+++ b/modules/extra/m_ssl_openssl.cpp
@@ -23,7 +23,7 @@ static SSL_CTX *server_ctx, *client_ctx;
 
 class MySSLService : public SSLService
 {
- public:
+public:
 	MySSLService(Module *o, const Anope::string &n);
 
 	/** Initialize a socket to use SSL
@@ -34,7 +34,7 @@ class MySSLService : public SSLService
 
 class SSLSocketIO : public SocketIO
 {
- public:
+public:
 	/* The SSL socket for this socket */
 	SSL *sslsock;
 
@@ -93,7 +93,7 @@ class SSLModule : public Module
 {
 	Anope::string certfile, keyfile;
 
- public:
+public:
 	MySSLService service;
 
 	SSLModule(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), service(this, "ssl")
diff --git a/modules/extra/stats/cs_fantasy_stats.cpp b/modules/extra/stats/cs_fantasy_stats.cpp
index 3416947d1..e9c777534 100644
--- a/modules/extra/stats/cs_fantasy_stats.cpp
+++ b/modules/extra/stats/cs_fantasy_stats.cpp
@@ -14,7 +14,7 @@
 
 class MySQLInterface : public SQL::Interface
 {
- public:
+public:
 	MySQLInterface(Module *o) : SQL::Interface(o) { }
 
 	void OnResult(const SQL::Result &r) override
@@ -33,7 +33,7 @@ class MySQLInterface : public SQL::Interface
 
 class CommandCSStats : public Command
 {
- public:
+public:
 	CommandCSStats(Module *creator) : Command (creator, "chanserv/stats", 0, 2)
 	{
 		this->SetDesc(_("Displays your Channel Stats"));
@@ -45,7 +45,7 @@ class CommandCSStats : public Command
 
 class CommandCSGStats : public Command
 {
- public:
+public:
 	CommandCSGStats(Module *creator) : Command (creator, "chanserv/gstats", 0, 2)
 	{
 		this->SetDesc(_("Displays your Global Stats"));
@@ -65,7 +65,7 @@ class CSStats : public Module
 	ServiceReference<SQL::Provider> sql;
 	MySQLInterface sqlinterface;
 	Anope::string prefix;
- public:
+public:
 	CSStats(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcsstats(this), commandcsgstats(this), sql("", ""), sqlinterface(this)
 	{
diff --git a/modules/extra/stats/cs_fantasy_top.cpp b/modules/extra/stats/cs_fantasy_top.cpp
index e2564db90..0d7b88bdd 100644
--- a/modules/extra/stats/cs_fantasy_top.cpp
+++ b/modules/extra/stats/cs_fantasy_top.cpp
@@ -14,7 +14,7 @@
 
 class MySQLInterface : public SQL::Interface
 {
- public:
+public:
 	MySQLInterface(Module *o) : SQL::Interface(o) { }
 
 	void OnResult(const SQL::Result &r) override
@@ -32,7 +32,7 @@ class MySQLInterface : public SQL::Interface
 
 class CommandCSTop : public Command
 {
- public:
+public:
 	CommandCSTop(Module *creator) : Command (creator, "chanserv/top", 0, 2)
 	{
 		this->SetDesc(_("Displays the top 3 users of a channel"));
@@ -44,7 +44,7 @@ class CommandCSTop : public Command
 
 class CommandCSTop10 : public Command
 {
- public:
+public:
 	CommandCSTop10(Module *creator) : Command (creator, "chanserv/top10", 0, 2)
 	{
 		this->SetDesc(_("Displays the top 10 users of a channel"));
@@ -56,7 +56,7 @@ class CommandCSTop10 : public Command
 
 class CommandCSGTop : public Command
 {
- public:
+public:
 	CommandCSGTop(Module *creator) : Command (creator, "chanserv/gtop", 0, 1)
 	{
 		this->SetDesc(_("Displays the top 3 users of the network"));
@@ -67,7 +67,7 @@ class CommandCSGTop : public Command
 
 class CommandCSGTop10 : public Command
 {
- public:
+public:
 	CommandCSGTop10(Module *creator) : Command (creator, "chanserv/gtop10", 0, 1)
 	{
 		this->SetDesc(_("Displays the top 10 users of the network"));
@@ -89,7 +89,7 @@ class CSTop : public Module
 	MySQLInterface sqlinterface;
 	Anope::string prefix;
 
- public:
+public:
 	CSTop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandcstop(this), commandcsgtop(this), commandcstop10(this), commandcsgtop10(this), sql("", ""),
 		sqlinterface(this)
diff --git a/modules/extra/stats/irc2sql/irc2sql.h b/modules/extra/stats/irc2sql/irc2sql.h
index d343837b5..700e28cf2 100644
--- a/modules/extra/stats/irc2sql/irc2sql.h
+++ b/modules/extra/stats/irc2sql/irc2sql.h
@@ -13,7 +13,7 @@
 
 class MySQLInterface : public SQL::Interface
 {
- public:
+public:
 	MySQLInterface(Module *o) : SQL::Interface(o) { }
 
 	void OnResult(const SQL::Result &r) override
@@ -49,7 +49,7 @@ class IRC2SQL : public Module
 
 	void CheckTables();
 
- public:
+public:
 	IRC2SQL(const Anope::string &modname, const Anope::string &creator) :
 		Module(modname, creator, EXTRA | VENDOR), sql("", ""), sqlinterface(this), versionreply(this, "CTCPVERSION")
 	{
diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp
index 34cd08056..204eb7cd6 100644
--- a/modules/extra/stats/m_chanstats.cpp
+++ b/modules/extra/stats/m_chanstats.cpp
@@ -11,7 +11,7 @@
 
 class CommandCSSetChanstats : public Command
 {
- public:
+public:
 	CommandCSSetChanstats(Module *creator) : Command(creator, "chanserv/set/chanstats", 2, 2)
 	{
 		this->SetDesc(_("Turn chanstats statistics on or off"));
@@ -65,7 +65,7 @@ class CommandCSSetChanstats : public Command
 
 class CommandNSSetChanstats : public Command
 {
- public:
+public:
 	CommandNSSetChanstats(Module *creator, const Anope::string &sname = "nickserv/set/chanstats", size_t min = 1 ) : Command(creator, sname, min, min + 1)
 	{
 		this->SetDesc(_("Turn chanstats statistics on or off"));
@@ -123,7 +123,7 @@ class CommandNSSetChanstats : public Command
 
 class CommandNSSASetChanstats : public CommandNSSetChanstats
 {
- public:
+public:
 	CommandNSSASetChanstats(Module *creator) : CommandNSSetChanstats(creator, "nickserv/saset/chanstats", 2)
 	{
 		this->ClearSyntax();
@@ -146,7 +146,7 @@ class CommandNSSASetChanstats : public CommandNSSetChanstats
 
 class MySQLInterface : public SQL::Interface
 {
- public:
+public:
 	MySQLInterface(Module *o) : SQL::Interface(o) { }
 
 	void OnResult(const SQL::Result &r) override
@@ -483,7 +483,7 @@ class MChanstats : public Module
 	}
 
 
- public:
+public:
 	MChanstats(const Anope::string &modname, const Anope::string &creator) :
 		Module(modname, creator, EXTRA | VENDOR),
 		cs_stats(this, "CS_STATS"), ns_stats(this, "NS_STATS"),
@@ -547,7 +547,7 @@ class MChanstats : public Module
 		return EVENT_CONTINUE;
 	}
 
- private:
+private:
 	void OnModeChange(Channel *c, User *u)
 	{
 		if (!u || !u->Account() || !c->ci || !cs_stats.HasExt(c->ci))
@@ -559,7 +559,7 @@ class MChanstats : public Module
 		this->RunQuery(query);
 	}
 
- public:
+public:
 	void OnPreUserKicked(const MessageSource &source, ChanUserContainer *cu, const Anope::string &kickmsg) override
 	{
 		if (!cu->chan->ci || !cs_stats.HasExt(cu->chan->ci))
diff --git a/modules/fantasy.cpp b/modules/fantasy.cpp
index e35b2c299..9ba6ee93e 100644
--- a/modules/fantasy.cpp
+++ b/modules/fantasy.cpp
@@ -13,7 +13,7 @@
 
 class CommandBSSetFantasy : public Command
 {
- public:
+public:
 	CommandBSSetFantasy(Module *creator, const Anope::string &sname = "botserv/set/fantasy") : Command(creator, sname, 2, 2)
 	{
 		this->SetDesc(_("Enable fantaisist commands"));
@@ -86,7 +86,7 @@ class Fantasy : public Module
 
 	CommandBSSetFantasy commandbssetfantasy;
 
- public:
+public:
 	Fantasy(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		fantasy(this, "BS_FANTASY"), commandbssetfantasy(this)
 	{
diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp
index 59f1adb79..0d9fd2990 100644
--- a/modules/m_dns.cpp
+++ b/modules/m_dns.cpp
@@ -200,7 +200,7 @@ class Packet : public Query
 		return record;
 	}
 
- public:
+public:
 	static const int POINTER = 0xC0;
 	static const int LABEL = 0x3F;
 	static const int HEADER_LENGTH = 12;
@@ -450,7 +450,7 @@ namespace DNS
 {
 	class ReplySocket : public virtual Socket
 	{
-	 public:
+	public:
 		~ReplySocket() override = default;
 		virtual void Reply(Packet *p) = 0;
 	};
@@ -461,7 +461,7 @@ class TCPSocket : public ListenSocket
 {
 	Manager *manager;
 
- public:
+public:
 	/* A TCP client */
 	class Client : public ClientSocket, public Timer, public ReplySocket
 	{
@@ -470,7 +470,7 @@ class TCPSocket : public ListenSocket
 		unsigned char packet_buffer[524];
 		int length = 0;
 
-	 public:
+	public:
 		Client(Manager *m, TCPSocket *l, int fd, const sockaddrs &addr) : Socket(fd, l->GetFamily()), ClientSocket(l, addr), Timer(5),
 			manager(m)
 		{
@@ -555,7 +555,7 @@ class UDPSocket : public ReplySocket
 	Manager *manager;
 	std::deque<Packet *> packets;
 
- public:
+public:
 	UDPSocket(Manager *m, const Anope::string &ip, int port) : Socket(-1, ip.find(':') == Anope::string::npos ? AF_INET : AF_INET6, SOCK_DGRAM), manager(m) { }
 
 	~UDPSocket() override
@@ -613,7 +613,7 @@ class UDPSocket : public ReplySocket
 class NotifySocket : public Socket
 {
 	Packet *packet;
- public:
+public:
 	NotifySocket(int family, Packet *p) : Socket(-1, family, SOCK_DGRAM), packet(p)
 	{
 		SocketEngine::Change(this, false, SF_READABLE);
@@ -657,7 +657,7 @@ class MyManager : public Manager, public Timer
 	sockaddrs addrs;
 
 	std::vector<std::pair<Anope::string, short> > notify;
- public:
+public:
 	std::map<unsigned short, Request *> requests;
 
 	MyManager(Module *creator) : Manager(creator), Timer(300, Anope::CurTime, true), serial(Anope::CurTime), cur_id(rand())
@@ -714,7 +714,7 @@ class MyManager : public Manager, public Timer
 		notify = n;
 	}
 
- private:
+private:
 	unsigned short cur_id;
 
 	unsigned short GetID()
@@ -729,7 +729,7 @@ class MyManager : public Manager, public Timer
 		return cur_id;
 	}
 
- public:
+public:
 	void Process(Request *req) override
 	{
 		Log(LOG_DEBUG_2) << "Resolver: Processing request to lookup " << req->name << ", of type " << req->type;
@@ -967,7 +967,7 @@ class MyManager : public Manager, public Timer
 		}
 	}
 
- private:
+private:
 	/** Add a record to the dns cache
 	 * @param r The record
 	 */
@@ -1007,7 +1007,7 @@ class ModuleDNS : public Module
 
 	std::vector<std::pair<Anope::string, short> > notify;
 
- public:
+public:
 	ModuleDNS(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), manager(this)
 	{
 
diff --git a/modules/m_dnsbl.cpp b/modules/m_dnsbl.cpp
index 59cd1f3fc..13078f56c 100644
--- a/modules/m_dnsbl.cpp
+++ b/modules/m_dnsbl.cpp
@@ -45,7 +45,7 @@ class DNSBLResolver : public Request
 	Blacklist blacklist;
 	bool add_to_akill;
 
- public:
+public:
 	DNSBLResolver(Module *c, User *u, const Blacklist &b, const Anope::string &host, bool add_akill) : Request(dnsmanager, c, host, QUERY_A, true), user(u), blacklist(b), add_to_akill(add_akill) { }
 
 	void OnLookupComplete(const Query *record) override
@@ -102,7 +102,7 @@ class ModuleDNSBL : public Module
 	bool check_on_netburst;
 	bool add_to_akill;
 
- public:
+public:
 	ModuleDNSBL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR | EXTRA)
 	{
 
diff --git a/modules/m_helpchan.cpp b/modules/m_helpchan.cpp
index 4a56f5ec0..8c136a07e 100644
--- a/modules/m_helpchan.cpp
+++ b/modules/m_helpchan.cpp
@@ -10,7 +10,7 @@
 
 class HelpChannel : public Module
 {
- public:
+public:
 	HelpChannel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
 	{
 	}
diff --git a/modules/m_httpd.cpp b/modules/m_httpd.cpp
index e1f3cceba..a2bb074d4 100644
--- a/modules/m_httpd.cpp
+++ b/modules/m_httpd.cpp
@@ -89,7 +89,7 @@ class MyHTTPClient : public HTTPClient
 			this->SendReply(&reply);
 	}
 
- public:
+public:
 	time_t created;
 
 	MyHTTPClient(HTTPProvider *l, int f, const sockaddrs &a) : Socket(f, l->GetFamily()), HTTPClient(l, f, a), provider(l), ip(a.addr()), created(Anope::CurTime)
@@ -288,7 +288,7 @@ class MyHTTPProvider : public HTTPProvider, public Timer
 	std::map<Anope::string, HTTPPage *> pages;
 	std::list<Reference<MyHTTPClient> > clients;
 
- public:
+public:
 	MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s) : Socket(-1, i.find(':') == Anope::string::npos ? AF_INET : AF_INET6), HTTPProvider(c, n, i, p, s), Timer(c, 10, Anope::CurTime, true), timeout(t) { }
 
 	void Tick(time_t) override
@@ -333,7 +333,7 @@ class HTTPD : public Module
 {
 	ServiceReference<SSLService> sslref;
 	std::map<Anope::string, MyHTTPProvider *> providers;
- public:
+public:
 	HTTPD(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), sslref("SSLService", "ssl")
 	{
 
diff --git a/modules/m_proxyscan.cpp b/modules/m_proxyscan.cpp
index d2b901d64..2bc4edbe5 100644
--- a/modules/m_proxyscan.cpp
+++ b/modules/m_proxyscan.cpp
@@ -25,7 +25,7 @@ class ProxyCallbackListener : public ListenSocket
 {
 	class ProxyCallbackClient : public ClientSocket, public BufferedSocket
 	{
-	 public:
+	public:
 		ProxyCallbackClient(ListenSocket *l, int f, const sockaddrs &a) : Socket(f, l->GetFamily()), ClientSocket(l, a), BufferedSocket()
 		{
 		}
@@ -41,7 +41,7 @@ class ProxyCallbackListener : public ListenSocket
 		}
 	};
 
- public:
+public:
 	ProxyCallbackListener(const Anope::string &b, int p) : Socket(-1, b.find(':') == Anope::string::npos ? AF_INET : AF_INET6), ListenSocket(b, p, false)
 	{
 	}
@@ -56,7 +56,7 @@ class ProxyConnect : public ConnectionSocket
 {
 	static ServiceReference<XLineManager> akills;
 
- public:
+public:
 	static std::set<ProxyConnect *> proxies;
 
 	ProxyCheck proxy;
@@ -77,7 +77,7 @@ class ProxyConnect : public ConnectionSocket
 	void OnConnect() override = 0;
 	virtual const Anope::string GetType() const = 0;
 
- protected:
+protected:
 	void Ban()
 	{
 		Anope::string reason = this->proxy.reason;
@@ -109,7 +109,7 @@ std::set<ProxyConnect *> ProxyConnect::proxies;
 
 class HTTPProxyConnect : public ProxyConnect, public BufferedSocket
 {
- public:
+public:
 	HTTPProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ProxyConnect(p, po), BufferedSocket()
 	{
 	}
@@ -141,7 +141,7 @@ class HTTPProxyConnect : public ProxyConnect, public BufferedSocket
 
 class SOCKS5ProxyConnect : public ProxyConnect, public BinarySocket
 {
- public:
+public:
 	SOCKS5ProxyConnect(ProxyCheck &p, unsigned short po) : Socket(-1), ProxyConnect(p, po), BinarySocket()
 	{
 	}
@@ -200,7 +200,7 @@ class ModuleProxyScan : public Module
 
 	class ConnectionTimeout : public Timer
 	{
-	 public:
+	public:
 		ConnectionTimeout(Module *c, long timeout) : Timer(c, timeout, Anope::CurTime, true)
 		{
 		}
@@ -218,7 +218,7 @@ class ModuleProxyScan : public Module
 		}
 	} connectionTimeout;
 
- public:
+public:
 	ModuleProxyScan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		connectionTimeout(this, 5)
 	{
diff --git a/modules/m_redis.cpp b/modules/m_redis.cpp
index a846e7f39..86211f040 100644
--- a/modules/m_redis.cpp
+++ b/modules/m_redis.cpp
@@ -16,7 +16,7 @@ class MyRedisService;
 class RedisSocket : public BinarySocket, public ConnectionSocket
 {
 	size_t ParseReply(Reply &r, const char *buf, size_t l);
- public:
+public:
 	MyRedisService *provider;
 	std::deque<Interface *> interfaces;
 	std::map<Anope::string, Interface *> subinterfaces;
@@ -33,7 +33,7 @@ class RedisSocket : public BinarySocket, public ConnectionSocket
 
 class Transaction : public Interface
 {
- public:
+public:
 	std::deque<Interface *> interfaces;
 
 	Transaction(Module *creator) : Interface(creator) { }
@@ -73,7 +73,7 @@ class Transaction : public Interface
 
 class MyRedisService : public Provider
 {
- public:
+public:
 	Anope::string host;
 	int port;
 	unsigned db;
@@ -107,7 +107,7 @@ class MyRedisService : public Provider
 		}
 	}
 
- private:
+private:
 	inline void Pack(std::vector<char> &buffer, const char *buf, size_t sz = 0)
 	{
 		if (!sz)
@@ -149,7 +149,7 @@ class MyRedisService : public Provider
 			s->interfaces.push_back(i);
 	}
 
- public:
+public:
 	bool IsSocketDead() override
 	{
 		return this->sock && this->sock->flags[SF_DEAD];
@@ -196,7 +196,7 @@ class MyRedisService : public Provider
 		this->SendCommand(i, args);
 	}
 
- public:
+public:
 	bool BlockAndProcess() override
 	{
 		if (!this->sock->ProcessWrite())
@@ -520,7 +520,7 @@ class ModuleRedis : public Module
 {
 	std::map<Anope::string, MyRedisService *> services;
 
- public:
+public:
 	ModuleRedis(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
 	}
diff --git a/modules/m_rewrite.cpp b/modules/m_rewrite.cpp
index b5218756c..2432340f6 100644
--- a/modules/m_rewrite.cpp
+++ b/modules/m_rewrite.cpp
@@ -99,7 +99,7 @@ std::vector<Rewrite> Rewrite::rewrites;
 
 class RewriteCommand : public Command
 {
- public:
+public:
 	RewriteCommand(Module *creator) : Command(creator, "rewrite", 0, 0) { }
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
@@ -149,7 +149,7 @@ class ModuleRewrite : public Module
 {
 	RewriteCommand cmdrewrite;
 
- public:
+public:
 	ModuleRewrite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR | EXTRA), cmdrewrite(this)
 	{
 	}
diff --git a/modules/m_sasl.cpp b/modules/m_sasl.cpp
index a64aa7440..72d3e7abc 100644
--- a/modules/m_sasl.cpp
+++ b/modules/m_sasl.cpp
@@ -14,7 +14,7 @@ using namespace SASL;
 
 class Plain : public Mechanism
 {
- public:
+public:
 	Plain(Module *o) : Mechanism(o, "PLAIN") { }
 
 	void ProcessMessage(Session *sess, const SASL::Message &m) override
@@ -83,7 +83,7 @@ class External : public Mechanism
 		Session(Mechanism *m, const Anope::string &u) : SASL::Session(m, u) { }
 	};
 
- public:
+public:
 	External(Module *o) : Mechanism(o, "EXTERNAL"), certs("CertService", "certs")
 	{
 		if (!IRCD || !IRCD->CanCertFP)
@@ -136,7 +136,7 @@ class External : public Mechanism
 
 class Anonymous : public Mechanism
 {
- public:
+public:
 	Anonymous(Module *o) : Mechanism(o, "ANONYMOUS") { }
 
 	void ProcessMessage(Session *sess, const SASL::Message &m) override
@@ -174,7 +174,7 @@ class SASLService : public SASL::Service, public Timer
 {
 	std::map<Anope::string, SASL::Session *> sessions;
 
- public:
+public:
 	SASLService(Module *o) : SASL::Service(o), Timer(o, 60, Anope::CurTime, true) { }
 
 	~SASLService() override
@@ -370,7 +370,7 @@ class ModuleSASL : public Module
 			IRCD->SendSASLMechanisms(mechs);
 	}
 
- public:
+public:
 	ModuleSASL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		sasl(this), anonymous(this), plain(this)
 	{
diff --git a/modules/m_xmlrpc.cpp b/modules/m_xmlrpc.cpp
index 2ced4bca9..984432de6 100644
--- a/modules/m_xmlrpc.cpp
+++ b/modules/m_xmlrpc.cpp
@@ -36,7 +36,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
 {
 	std::deque<XMLRPCEvent *> events;
 
- public:
+public:
 	MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname) : XMLRPCServiceInterface(creator, sname), HTTPPage("/xmlrpc", "text/xml") { }
 
 	void Register(XMLRPCEvent *event) override
@@ -93,7 +93,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
 		return ret;
 	}
 
- private:
+private:
 	static bool GetData(Anope::string &content, Anope::string &tag, Anope::string &data)
 	{
 		if (content.empty())
@@ -144,7 +144,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
 		return !istag && !data.empty();
 	}
 
- public:
+public:
 	bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) override
 	{
 		Anope::string content = message.content, tname, data;
@@ -197,7 +197,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
 class ModuleXMLRPC : public Module
 {
 	ServiceReference<HTTPProvider> httpref;
- public:
+public:
 	MyXMLRPCServiceInterface xmlrpcinterface;
 
 	ModuleXMLRPC(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
diff --git a/modules/m_xmlrpc_main.cpp b/modules/m_xmlrpc_main.cpp
index cdc12ed7f..948ab6288 100644
--- a/modules/m_xmlrpc_main.cpp
+++ b/modules/m_xmlrpc_main.cpp
@@ -19,7 +19,7 @@ class XMLRPCIdentifyRequest : public IdentifyRequest
 	Reference<HTTPClient> client;
 	Reference<XMLRPCServiceInterface> xinterface;
 
- public:
+public:
 	XMLRPCIdentifyRequest(Module *m, XMLRPCRequest& req, HTTPClient *c, XMLRPCServiceInterface* iface, const Anope::string &acc, const Anope::string &pass) : IdentifyRequest(m, acc, pass), request(req), repl(request.r), client(c), xinterface(iface) { }
 
 	void OnSuccess() override
@@ -52,7 +52,7 @@ class XMLRPCIdentifyRequest : public IdentifyRequest
 
 class MyXMLRPCEvent : public XMLRPCEvent
 {
- public:
+public:
 	bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) override
 	{
 		if (request.name == "command")
@@ -73,7 +73,7 @@ class MyXMLRPCEvent : public XMLRPCEvent
 		return true;
 	}
 
- private:
+private:
 	void DoCommand(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request)
 	{
 		Anope::string service = request.data.size() > 0 ? request.data[0] : "";
@@ -281,7 +281,7 @@ class ModuleXMLRPCMain : public Module
 
 	MyXMLRPCEvent stats;
 
- public:
+public:
 	ModuleXMLRPCMain(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), xmlrpc("XMLRPCServiceInterface", "xmlrpc")
 	{
 		me = this;
diff --git a/modules/ns_maxemail.cpp b/modules/ns_maxemail.cpp
index 28aebbf55..16d41bcff 100644
--- a/modules/ns_maxemail.cpp
+++ b/modules/ns_maxemail.cpp
@@ -73,7 +73,7 @@ class NSMaxEmail : public Module
 		return count;
 	}
 
- public:
+public:
 	NSMaxEmail(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
 	{
 	}
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 091b6b999..e1e5fe36b 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -13,7 +13,7 @@
 
 class ChannelModeFlood : public ChannelModeParam
 {
- public:
+public:
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -32,7 +32,7 @@ class ChannelModeFlood : public ChannelModeParam
 
 class BahamutIRCdProto : public IRCDProto
 {
- public:
+public:
 	BahamutIRCdProto(Module *creator) : IRCDProto(creator, "Bahamut 1.8.x")
 	{
 		DefaultPseudoclientModes = "+";
@@ -541,7 +541,7 @@ class ProtoBahamut : public Module
 		ModeManager::AddChannelMode(new ChannelMode("REGISTEREDONLY", 'R'));
 	}
 
- public:
+public:
 	ProtoBahamut(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_invite(this),
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 465f3fd25..416468aff 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -23,7 +23,7 @@ class HybridProto : public IRCDProto
 		u->KillInternal(source, buf);
 	}
 
- public:
+public:
 	HybridProto(Module *creator) : IRCDProto(creator, "ircd-hybrid 8.2.23+")
 	{
 		DefaultPseudoclientModes = "+oi";
@@ -765,7 +765,7 @@ class ProtoHybrid : public Module
 		ModeManager::AddChannelMode(new ChannelModeNoone("ISSECURE", 'Z'));
 	}
 
- public:
+public:
 	ProtoHybrid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this),
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index 70475b20c..e3eb9d1d3 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -28,7 +28,7 @@ static Anope::string rsquit_server, rsquit_id;
 
 class InspIRCdProto : public IRCDProto
 {
- private:
+private:
 	void SendChgIdentInternal(const Anope::string &nick, const Anope::string &vIdent)
 	{
 		if (!Servers::Capab.count("CHGIDENT"))
@@ -61,7 +61,7 @@ class InspIRCdProto : public IRCDProto
 		UplinkSocket::Message(Me) << "METADATA " << uid << " accountname :" << (na ? na->nc->display : Anope::string());
 	}
 
- public:
+public:
 	PrimitiveExtensibleItem<ListLimits> maxlist;
 
 	InspIRCdProto(Module *creator) : IRCDProto(creator, "InspIRCd 3+"), maxlist(creator, "maxlist")
@@ -520,7 +520,7 @@ class InspIRCdProto : public IRCDProto
 
 class InspIRCdAutoOpMode : public ChannelModeList
 {
- public:
+public:
 	InspIRCdAutoOpMode(char mode) : ChannelModeList("AUTOOP", mode)
 	{
 	}
@@ -537,7 +537,7 @@ class InspIRCdExtBan : public ChannelModeVirtual<ChannelModeList>
 {
 	char ext;
 
- public:
+public:
 	InspIRCdExtBan(const Anope::string &mname, const Anope::string &basename, char extban) : ChannelModeVirtual<ChannelModeList>(mname, basename)
 		, ext(extban)
 	{
@@ -563,7 +563,7 @@ namespace InspIRCdExtban
 {
 	class EntryMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -579,7 +579,7 @@ namespace InspIRCdExtban
 
 	class ChannelMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		ChannelMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -615,7 +615,7 @@ namespace InspIRCdExtban
 
 	class AccountMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -631,7 +631,7 @@ namespace InspIRCdExtban
 
 	class RealnameMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -646,7 +646,7 @@ namespace InspIRCdExtban
 
 	class ServerMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -661,7 +661,7 @@ namespace InspIRCdExtban
 
 	class FingerprintMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -676,7 +676,7 @@ namespace InspIRCdExtban
 
 	class UnidentifiedMatcher : public InspIRCdExtBan
 	{
-	 public:
+	public:
 		UnidentifiedMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
 		{
 		}
@@ -692,7 +692,7 @@ namespace InspIRCdExtban
 
 class ColonDelimitedParamMode : public ChannelModeParam
 {
- public:
+public:
 	ColonDelimitedParamMode(const Anope::string &modename, char modeChar) : ChannelModeParam(modename, modeChar, true) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -741,7 +741,7 @@ class ColonDelimitedParamMode : public ChannelModeParam
 
 class SimpleNumberParamMode : public ChannelModeParam
 {
- public:
+public:
 	SimpleNumberParamMode(const Anope::string &modename, char modeChar) : ChannelModeParam(modename, modeChar, true) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -766,7 +766,7 @@ class SimpleNumberParamMode : public ChannelModeParam
 
 class ChannelModeFlood : public ColonDelimitedParamMode
 {
- public:
+public:
 	ChannelModeFlood(char modeChar) : ColonDelimitedParamMode("FLOOD", modeChar) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -780,7 +780,7 @@ class ChannelModeFlood : public ColonDelimitedParamMode
 
 class ChannelModeHistory : public ColonDelimitedParamMode
 {
- public:
+public:
 	ChannelModeHistory(char modeChar) : ColonDelimitedParamMode("HISTORY", modeChar) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -791,7 +791,7 @@ class ChannelModeHistory : public ColonDelimitedParamMode
 
 class ChannelModeRedirect : public ChannelModeParam
 {
- public:
+public:
 	ChannelModeRedirect(char modeChar) : ChannelModeParam("REDIRECT", modeChar, true) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -1351,7 +1351,7 @@ class IRCDMessageMetadata : IRCDMessage
 	const bool &do_mlock;
 	PrimitiveExtensibleItem<ListLimits> &maxlist;
 
- public:
+public:
 	IRCDMessageMetadata(Module *creator, const bool &handle_topiclock, const bool &handle_mlock, PrimitiveExtensibleItem<ListLimits> &listlimits) : IRCDMessage(creator, "METADATA", 3), do_topiclock(handle_topiclock), do_mlock(handle_mlock), maxlist(listlimits) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
@@ -1907,7 +1907,7 @@ class ProtoInspIRCd : public Module
 		UplinkSocket::Message(Me) << "METADATA " << c->name << " " << c->creation_time << " " << metadataname << " :" << value;
 	}
 
- public:
+public:
 	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this), ssl(this, "ssl"),
 		message_error(this), message_invite(this), message_kill(this), message_motd(this), message_notice(this),
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 8a88eab61..62da389a8 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -19,7 +19,7 @@ class ngIRCdProto : public IRCDProto
 		user->KillInternal(source, buf);
 	}
 
- public:
+public:
 	ngIRCdProto(Module *creator) : IRCDProto(creator, "ngIRCd")
 	{
 		DefaultPseudoclientModes = "+oi";
@@ -649,7 +649,7 @@ class ProtongIRCd : public Module
 		ModeManager::AddChannelMode(new ChannelMode("SSL", 'z'));
 	}
 
- public:
+public:
 	ProtongIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_capab(this), message_error(this), message_invite(this), message_kick(this), message_kill(this),
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 679915b9d..47014b228 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -18,7 +18,7 @@ static ServiceReference<IRCDProto> hybrid("IRCDProto", "hybrid");
 
 class PlexusProto : public IRCDProto
 {
- public:
+public:
 	PlexusProto(Module *creator) : IRCDProto(creator, "hybrid-7.2.3+plexus-3.0.1")
 	{
 		DefaultPseudoclientModes = "+iU";
@@ -413,7 +413,7 @@ class ProtoPlexus : public Module
 		ModeManager::AddChannelMode(new ChannelMode("PERM", 'z'));
 	}
 
- public:
+public:
 	ProtoPlexus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_invite(this), message_kick(this), message_kill(this),
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 89a190d7e..5994bc802 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -31,7 +31,7 @@ class RatboxProto : public IRCDProto
 		return NULL;
 	}
 
- public:
+public:
 	RatboxProto(Module *creator) : IRCDProto(creator, "Ratbox 3.0+")
 	{
 		DefaultPseudoclientModes = "+oiS";
@@ -334,7 +334,7 @@ class ProtoRatbox : public Module
 		ModeManager::AddChannelMode(new ChannelMode("SSL", 'S'));
 	}
 
- public:
+public:
 	ProtoRatbox(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_invite(this), message_kick(this),
diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
index c01c4f551..169564ed4 100644
--- a/modules/protocol/solanum.cpp
+++ b/modules/protocol/solanum.cpp
@@ -19,7 +19,7 @@ static ServiceReference<IRCDProto> ratbox("IRCDProto", "ratbox");
 
 class ChannelModeLargeBan : public ChannelMode
 {
- public:
+public:
 	ChannelModeLargeBan(const Anope::string &mname, char modeChar) : ChannelMode(mname, modeChar) { }
 
 	bool CanSet(User *u) const override
@@ -31,7 +31,7 @@ class ChannelModeLargeBan : public ChannelMode
 
 class SolanumProto : public IRCDProto
 {
- public:
+public:
 
 	SolanumProto(Module *creator) : IRCDProto(creator, "Solanum")
 	{
@@ -370,7 +370,7 @@ class ProtoSolanum : public Module
 		ModeManager::AddChannelMode(new ChannelMode("OPMODERATED", 'z'));
 	}
 
- public:
+public:
 	ProtoSolanum(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_invite(this), message_kick(this),
diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
index 88826b7da..738a27dfc 100644
--- a/modules/protocol/unrealircd.cpp
+++ b/modules/protocol/unrealircd.cpp
@@ -18,7 +18,7 @@ static Anope::string UplinkSID;
 
 class UnrealIRCdProto : public IRCDProto
 {
- public:
+public:
 	PrimitiveExtensibleItem<ModData> ClientModData;
 	PrimitiveExtensibleItem<ModData> ChannelModData;
 
@@ -40,7 +40,7 @@ class UnrealIRCdProto : public IRCDProto
 		MaxModes = 12;
 	}
 
- private:
+private:
 	/* SVSNOOP */
 	void SendSVSNOOP(const Server *server, bool set) override
 	{
@@ -436,7 +436,7 @@ class UnrealExtBan : public ChannelModeVirtual<ChannelModeList>
 {
 	char ext;
 
- public:
+public:
 	UnrealExtBan(const Anope::string &mname, const Anope::string &basename, char extban) : ChannelModeVirtual<ChannelModeList>(mname, basename)
 		, ext(extban)
 	{
@@ -462,7 +462,7 @@ namespace UnrealExtban
 {
 	class ChannelMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		ChannelMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -497,7 +497,7 @@ namespace UnrealExtban
 
 	class EntryMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -513,7 +513,7 @@ namespace UnrealExtban
 
 	class RealnameMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -529,7 +529,7 @@ namespace UnrealExtban
 
 	class RegisteredMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -543,7 +543,7 @@ namespace UnrealExtban
 
 	class AccountMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -562,7 +562,7 @@ namespace UnrealExtban
 
 	class FingerprintMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -577,7 +577,7 @@ namespace UnrealExtban
 
 	class OperclassMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 	 	OperclassMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -593,7 +593,7 @@ namespace UnrealExtban
 
 	class TimedBanMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 	 	TimedBanMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -610,7 +610,7 @@ namespace UnrealExtban
 
 	class CountryMatcher : public UnrealExtBan
 	{
-	 public:
+	public:
 	 	CountryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
 		}
@@ -637,7 +637,7 @@ namespace UnrealExtban
 
 class ChannelModeFlood : public ChannelModeParam
 {
- public:
+public:
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
 
 	/* Borrowed part of this check from UnrealIRCd */
@@ -688,7 +688,7 @@ class ChannelModeFlood : public ChannelModeParam
 
 class ChannelModeHistory : public ChannelModeParam /* stolen from inspircd3's ColonDelimitedParamMode */
 {
- public:
+public:
 	ChannelModeHistory(char modeChar) : ChannelModeParam("HISTORY", modeChar, true) { }
 
 	bool IsValid(Anope::string &value) const override
@@ -727,7 +727,7 @@ class ChannelModeHistory : public ChannelModeParam /* stolen from inspircd3's Co
 
 class ChannelModeUnrealSSL : public ChannelMode
 {
- public:
+public:
 	ChannelModeUnrealSSL(const Anope::string &n, char c) : ChannelMode(n, c)
 	{
 	}
@@ -1487,7 +1487,7 @@ struct IRCDMessageSJoin : IRCDMessage
 
 class IRCDMessageSVSLogin : IRCDMessage
 {
- public:
+public:
 	IRCDMessageSVSLogin(Module *creator) : IRCDMessage(creator, "SVSLOGIN", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
@@ -1674,7 +1674,7 @@ class ProtoUnreal : public Module
 
 	bool use_server_side_mlock;
 
- public:
+public:
 	ProtoUnreal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_error(this), message_invite(this), message_join(this), message_kick(this),
diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index 25cf8ab88..c7728ba6b 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -16,7 +16,7 @@ class BotServCore : public Module
 	Reference<BotInfo> BotServ;
 	ExtensibleRef<bool> persist, inhabit;
 
- public:
+public:
 	BotServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		persist("PERSIST"), inhabit("inhabit")
 	{
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index ca7c7b9ab..6d1503944 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -27,7 +27,7 @@ class ChanServCore : public Module, public ChanServService
 	ExtensibleRef<bool> persist;
 	bool always_lower = false;
 
- public:
+public:
 	ChanServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		ChanServService(this), inhabit(this, "inhabit"), persist("PERSIST")
 	{
@@ -44,7 +44,7 @@ class ChanServCore : public Module, public ChanServService
 			ExtensibleItem<bool> &inhabit;
 			Reference<Channel> c;
 
-		 public:
+		public:
 			/** Constructor
 			 * @param chan The channel
 			 */
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index c720282c7..d433cfabd 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -23,7 +23,7 @@ class GlobalCore : public Module, public GlobalService
 			this->ServerGlobal(sender, link, message);
 	}
 
- public:
+public:
 	GlobalCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		GlobalService(this)
 	{
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp
index 4ef1aecfa..f3d98037d 100644
--- a/modules/pseudoclients/hostserv.cpp
+++ b/modules/pseudoclients/hostserv.cpp
@@ -14,7 +14,7 @@
 class HostServCore : public Module
 {
 	Reference<BotInfo> HostServ;
- public:
+public:
 	HostServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 	{
 		if (!IRCD || !IRCD->CanSetVHost)
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index d6946247f..9777db445 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -35,7 +35,7 @@ class MemoServCore : public Module, public MemoServService
 		return Mail::Send(nc, subject, message);
 	}
 
- public:
+public:
 	MemoServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		MemoServService(this)
 	{
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index 4cdb3a238..594607591 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -23,7 +23,7 @@ class NickServCollide : public Timer
 	time_t ts;
 	Reference<NickAlias> na;
 
- public:
+public:
 	NickServCollide(Module *me, NickServService *nss, User *user, NickAlias *nick, time_t delay) : Timer(me, delay), service(nss), u(user), ts(user->timestamp), na(nick)
 	{
 		collides.insert(this);
@@ -62,7 +62,7 @@ class NickServHeld : public Timer
 {
 	Reference<NickAlias> na;
 	Anope::string nick;
- public:
+public:
 	NickServHeld(Module *me, NickAlias *n, long l) : Timer(me, l), na(n), nick(na->nick)
 	{
 		n->Extend<bool>("HELD");
@@ -84,7 +84,7 @@ class NickServRelease : public User, public Timer
 {
 	Anope::string nick;
 
- public:
+public:
 	NickServRelease(Module *me, NickAlias *na, time_t delay) : User(na->nick, Config->GetModule("nickserv")->Get<const Anope::string>("enforceruser", "user"),
 		Config->GetModule("nickserv")->Get<const Anope::string>("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick)
 	{
@@ -131,7 +131,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
- public:
+public:
 	NickServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		NickServService(this), held(this, "HELD"), collided(this, "COLLIDED")
 	{
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index 0d6c719c8..02830befb 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -13,7 +13,7 @@
 
 class SGLineManager : public XLineManager
 {
- public:
+public:
 	SGLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sgline", 'G') { }
 
 	void OnMatch(User *u, XLine *x) override
@@ -67,7 +67,7 @@ class SQLineManager : public XLineManager
 {
 	ServiceReference<NickServService> nickserv;
 
- public:
+public:
 	SQLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sqline", 'Q'), nickserv("NickServService", "NickServ") { }
 
 	void OnMatch(User *u, XLine *x) override
@@ -144,7 +144,7 @@ class SQLineManager : public XLineManager
 
 class SNLineManager : public XLineManager
 {
- public:
+public:
 	SNLineManager(Module *creator) : XLineManager(creator, "xlinemanager/snline", 'N') { }
 
 	void OnMatch(User *u, XLine *x) override
@@ -187,7 +187,7 @@ class OperServCore : public Module
 	SQLineManager sqlines;
 	SNLineManager snlines;
 
- public:
+public:
 	OperServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		sglines(this), sqlines(this), snlines(this)
 	{
diff --git a/modules/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h
index 26cba776b..09192c622 100644
--- a/modules/webcpanel/pages/chanserv/access.h
+++ b/modules/webcpanel/pages/chanserv/access.h
@@ -15,7 +15,7 @@ namespace ChanServ
 
 class Access : public WebPanelProtectedPage
 {
- public:
+public:
 	Access(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h
index b53383445..ddf3b0ce2 100644
--- a/modules/webcpanel/pages/chanserv/akick.h
+++ b/modules/webcpanel/pages/chanserv/akick.h
@@ -15,7 +15,7 @@ namespace ChanServ
 
 class Akick : public WebPanelProtectedPage
 {
- public:
+public:
 	Akick(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/chanserv/drop.h b/modules/webcpanel/pages/chanserv/drop.h
index 51b6ba2a3..d2c3225d4 100644
--- a/modules/webcpanel/pages/chanserv/drop.h
+++ b/modules/webcpanel/pages/chanserv/drop.h
@@ -15,7 +15,7 @@ namespace WebCPanel
 
 		class Drop : public WebPanelProtectedPage
 		{
-		 public:
+		public:
 			Drop(const Anope::string &cat, const Anope::string &u);
 
 			bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h
index c9fd670a4..00835c700 100644
--- a/modules/webcpanel/pages/chanserv/info.h
+++ b/modules/webcpanel/pages/chanserv/info.h
@@ -15,7 +15,7 @@ namespace ChanServ
 
 class Info : public WebPanelProtectedPage
 {
- public:
+public:
 	Info(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/chanserv/modes.h b/modules/webcpanel/pages/chanserv/modes.h
index 345e0022d..4c1db0474 100644
--- a/modules/webcpanel/pages/chanserv/modes.h
+++ b/modules/webcpanel/pages/chanserv/modes.h
@@ -15,7 +15,7 @@ namespace ChanServ
 
 class Modes : public WebPanelProtectedPage
 {
- public:
+public:
 	Modes(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h
index d715aa795..91db8f3a5 100644
--- a/modules/webcpanel/pages/chanserv/set.h
+++ b/modules/webcpanel/pages/chanserv/set.h
@@ -15,7 +15,7 @@ namespace ChanServ
 
 class Set : public WebPanelProtectedPage
 {
- public:
+public:
 	Set(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/confirm.h b/modules/webcpanel/pages/confirm.h
index b1f26d58d..9579b3bd6 100644
--- a/modules/webcpanel/pages/confirm.h
+++ b/modules/webcpanel/pages/confirm.h
@@ -14,7 +14,7 @@ namespace WebCPanel
 
 class Confirm : public WebPanelPage
 {
- public:
+public:
 	Confirm(const Anope::string &u) : WebPanelPage(u) { }
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) override;
diff --git a/modules/webcpanel/pages/hostserv/request.h b/modules/webcpanel/pages/hostserv/request.h
index d508c447f..ea2df582c 100644
--- a/modules/webcpanel/pages/hostserv/request.h
+++ b/modules/webcpanel/pages/hostserv/request.h
@@ -15,7 +15,7 @@ namespace HostServ
 
 class Request : public WebPanelProtectedPage
 {
- public:
+public:
 	Request(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/index.cpp b/modules/webcpanel/pages/index.cpp
index 2ba78db02..57ffa3b07 100644
--- a/modules/webcpanel/pages/index.cpp
+++ b/modules/webcpanel/pages/index.cpp
@@ -16,7 +16,7 @@ class WebpanelRequest : public IdentifyRequest
 	Reference<HTTPClient> client;
 	TemplateFileServer::Replacements replacements;
 
- public:
+public:
 	WebpanelRequest(Module *o, HTTPReply &r, HTTPMessage &m, HTTPProvider *s, const Anope::string &p_n, HTTPClient *c, TemplateFileServer::Replacements &re, const Anope::string &user, const Anope::string &pass) : IdentifyRequest(o, user, pass), reply(r), message(m), server(s), page_name(p_n), client(c), replacements(re) { }
 
 	void OnSuccess() override
diff --git a/modules/webcpanel/pages/index.h b/modules/webcpanel/pages/index.h
index 1f6102a4c..1ba4c5ff1 100644
--- a/modules/webcpanel/pages/index.h
+++ b/modules/webcpanel/pages/index.h
@@ -19,7 +19,7 @@ class Index : public WebPanelPage
 	Anope::hash_map<time_t> last_login_attempt;
 	time_t last_clear = 0;
 
- public:
+public:
 	Index(const Anope::string &u) : WebPanelPage(u) { }
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) override;
diff --git a/modules/webcpanel/pages/logout.h b/modules/webcpanel/pages/logout.h
index 5e05a1aed..0934906b4 100644
--- a/modules/webcpanel/pages/logout.h
+++ b/modules/webcpanel/pages/logout.h
@@ -12,7 +12,7 @@ namespace WebCPanel
 
 class Logout : public WebPanelProtectedPage
 {
- public:
+public:
 	Logout(const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memos.h
index 59cb46e84..f8190d471 100644
--- a/modules/webcpanel/pages/memoserv/memos.h
+++ b/modules/webcpanel/pages/memoserv/memos.h
@@ -15,7 +15,7 @@ namespace MemoServ
 
 class Memos : public WebPanelProtectedPage
 {
- public:
+public:
 	Memos(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/nickserv/access.h b/modules/webcpanel/pages/nickserv/access.h
index 031d1778f..8533b31ee 100644
--- a/modules/webcpanel/pages/nickserv/access.h
+++ b/modules/webcpanel/pages/nickserv/access.h
@@ -15,7 +15,7 @@ namespace NickServ
 
 class Access : public WebPanelProtectedPage
 {
- public:
+public:
 	Access(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h
index 8822492e0..4ac8887d2 100644
--- a/modules/webcpanel/pages/nickserv/alist.h
+++ b/modules/webcpanel/pages/nickserv/alist.h
@@ -15,7 +15,7 @@ namespace NickServ
 
 class Alist : public WebPanelProtectedPage
 {
- public:
+public:
 	Alist(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h
index 2c249bae1..03dfdd312 100644
--- a/modules/webcpanel/pages/nickserv/cert.h
+++ b/modules/webcpanel/pages/nickserv/cert.h
@@ -15,7 +15,7 @@ namespace NickServ
 
 class Cert : public WebPanelProtectedPage
 {
- public:
+public:
 	Cert(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/nickserv/confirm.h b/modules/webcpanel/pages/nickserv/confirm.h
index e89f500ef..7362c0375 100644
--- a/modules/webcpanel/pages/nickserv/confirm.h
+++ b/modules/webcpanel/pages/nickserv/confirm.h
@@ -13,7 +13,7 @@ namespace NickServ
 
 class Confirm : public WebPanelProtectedPage
 {
- public:
+public:
 	Confirm(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h
index 12f889b16..75f305043 100644
--- a/modules/webcpanel/pages/nickserv/info.h
+++ b/modules/webcpanel/pages/nickserv/info.h
@@ -15,7 +15,7 @@ namespace NickServ
 
 class Info : public WebPanelProtectedPage
 {
- public:
+public:
 	Info(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/operserv/akill.h b/modules/webcpanel/pages/operserv/akill.h
index c830f6930..d93811cae 100644
--- a/modules/webcpanel/pages/operserv/akill.h
+++ b/modules/webcpanel/pages/operserv/akill.h
@@ -15,7 +15,7 @@ namespace OperServ
 
 class Akill : public WebPanelProtectedPage
 {
- public:
+public:
 	Akill(const Anope::string &cat, const Anope::string &u);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
diff --git a/modules/webcpanel/pages/register.h b/modules/webcpanel/pages/register.h
index fd8cb46f2..8e743bd4b 100644
--- a/modules/webcpanel/pages/register.h
+++ b/modules/webcpanel/pages/register.h
@@ -14,7 +14,7 @@ namespace WebCPanel
 
 class Register : public WebPanelPage
 {
- public:
+public:
 	Register(const Anope::string &u) : WebPanelPage(u) { }
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) override;
diff --git a/modules/webcpanel/static_fileserver.h b/modules/webcpanel/static_fileserver.h
index 512177d1a..a085bb6c3 100644
--- a/modules/webcpanel/static_fileserver.h
+++ b/modules/webcpanel/static_fileserver.h
@@ -13,7 +13,7 @@
 class StaticFileServer : public HTTPPage
 {
 	Anope::string file_name;
- public:
+public:
 	StaticFileServer(const Anope::string &f_n, const Anope::string &u, const Anope::string &c_t);
 
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) override;
diff --git a/modules/webcpanel/template_fileserver.h b/modules/webcpanel/template_fileserver.h
index 21483765c..6ae520428 100644
--- a/modules/webcpanel/template_fileserver.h
+++ b/modules/webcpanel/template_fileserver.h
@@ -13,7 +13,7 @@
 class TemplateFileServer
 {
 	Anope::string file_name;
- public:
+public:
 	struct Replacements : std::multimap<Anope::string, Anope::string>
 	{
 		Anope::string& operator[](const Anope::string &key)
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index b381eecdc..b004d39ec 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -44,7 +44,7 @@ class ModuleWebCPanel : public Module
 	WebCPanel::OperServ::Akill operserv_akill;
 
 
- public:
+public:
 	ModuleWebCPanel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR),
 		panel(this, "webcpanel"),
 		id(this, "webcpanel_id"), ip(this, "webcpanel_ip"), last_login(this, "webcpanel_last_login"),
diff --git a/modules/webcpanel/webcpanel.h b/modules/webcpanel/webcpanel.h
index e432264c8..f683aef0e 100644
--- a/modules/webcpanel/webcpanel.h
+++ b/modules/webcpanel/webcpanel.h
@@ -32,7 +32,7 @@ struct Section
 /* An interface for this webpanel used by other modules */
 class Panel : public Section, public Service
 {
- public:
+public:
 	Panel(Module *c, const Anope::string &n) : Service(c, "Panel", n) { }
 
 	std::vector<Section> sections;
@@ -65,7 +65,7 @@ class Panel : public Section, public Service
 
 class WebPanelPage : public HTTPPage
 {
- public:
+public:
 	WebPanelPage(const Anope::string &u, const Anope::string &ct = "text/html") : HTTPPage(u, ct)
 	{
 	}
@@ -77,7 +77,7 @@ class WebPanelProtectedPage : public WebPanelPage
 {
 	Anope::string category;
 
- public:
+public:
 	WebPanelProtectedPage(const Anope::string &cat, const Anope::string &u, const Anope::string &ct = "text/html") : WebPanelPage(u, ct), category(cat)
 	{
 	}
diff --git a/src/main.cpp b/src/main.cpp
index e8e1a6a41..f4738b3c1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,7 +43,7 @@ size_t Anope::CurrentUplink = -1;
 
 class UpdateTimer : public Timer
 {
- public:
+public:
 	UpdateTimer(time_t timeout) : Timer(timeout, Anope::CurTime, true) { }
 
 	void Tick(time_t) override
@@ -54,7 +54,7 @@ class UpdateTimer : public Timer
 
 class ExpireTimer : public Timer
 {
- public:
+public:
 	ExpireTimer(time_t timeout) : Timer(timeout, Anope::CurTime, true) { }
 
 	void Tick(time_t) override
diff --git a/src/modes.cpp b/src/modes.cpp
index 6c46302de..3b0fa57f7 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -302,7 +302,7 @@ void StackerInfo::AddMode(Mode *mode, bool set, const Anope::string &param)
 
 static class ModePipe : public Pipe
 {
- public:
+public:
 	void OnNotify() override
 	{
 		ModeManager::ProcessModes();
diff --git a/src/uplink.cpp b/src/uplink.cpp
index 4d49b93d6..d3ddc403b 100644
--- a/src/uplink.cpp
+++ b/src/uplink.cpp
@@ -19,7 +19,7 @@ UplinkSocket *UplinkSock = NULL;
 
 class ReconnectTimer : public Timer
 {
- public:
+public:
 	ReconnectTimer(int wait) : Timer(wait) { }
 
 	void Tick(time_t) override