Remove some unnecessary spaces that break editor indentation.

103 files changed, 357 insertions, 357 deletions

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)
 	{