diff --git a/src/openrct2/audio/AudioChannel.cpp b/src/openrct2/audio/AudioChannel.cpp
index c646d334dc..1faac86448 100644
--- a/src/openrct2/audio/AudioChannel.cpp
+++ b/src/openrct2/audio/AudioChannel.cpp
@@ -31,12 +31,12 @@ private:
     uint64 _offset = 0;
     sint32 _loop = 0;
 
-    sint32     _volume = 1;
+    sint32  _volume = 1;
     float   _volume_l = 0.f;
     float   _volume_r = 0.f;
     float   _oldvolume_l = 0.f;
     float   _oldvolume_r = 0.f;
-    sint32     _oldvolume = 0;
+    sint32  _oldvolume = 0;
     float   _pan = 0;
 
     bool    _stopping = false;
diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h
index 33ee733c61..b185bf1382 100644
--- a/src/openrct2/audio/AudioChannel.h
+++ b/src/openrct2/audio/AudioChannel.h
@@ -36,7 +36,7 @@ interface IAudioChannel
     virtual SpeexResamplerState * GetResampler() const abstract;
     virtual void SetResampler(SpeexResamplerState * value) abstract;
 
-    virtual sint32     GetGroup() const abstract;
+    virtual sint32  GetGroup() const abstract;
     virtual void    SetGroup(sint32 group) abstract;
 
     virtual double  GetRate() const abstract;
@@ -45,15 +45,15 @@ interface IAudioChannel
     virtual uint64  GetOffset() const abstract;
     virtual bool    SetOffset(uint64 offset) abstract;
 
-    virtual sint32     GetLoop() const abstract;
+    virtual sint32  GetLoop() const abstract;
     virtual void    SetLoop(sint32 value) abstract;
 
-    virtual sint32     GetVolume() const abstract;
+    virtual sint32  GetVolume() const abstract;
     virtual float   GetVolumeL() const abstract;
     virtual float   GetVolumeR() const abstract;
     virtual float   GetOldVolumeL() const abstract;
     virtual float   GetOldVolumeR() const abstract;
-    virtual sint32     GetOldVolume() const abstract;
+    virtual sint32  GetOldVolume() const abstract;
     virtual void    SetVolume(sint32 volume) abstract;
 
     virtual float   GetPan() const abstract;
diff --git a/src/openrct2/audio/AudioFormat.h b/src/openrct2/audio/AudioFormat.h
index 839e3b1a6e..59f9d8bc08 100644
--- a/src/openrct2/audio/AudioFormat.h
+++ b/src/openrct2/audio/AudioFormat.h
@@ -25,9 +25,9 @@
  */
 struct AudioFormat
 {
-    sint32             freq;
+    sint32          freq;
     SDL_AudioFormat format;
-    sint32             channels;
+    sint32          channels;
 
     sint32 BytesPerSample() const
     {
diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp
index 3e01b69fbe..287c1c3cd0 100644
--- a/src/openrct2/core/String.hpp
+++ b/src/openrct2/core/String.hpp
@@ -29,7 +29,7 @@ namespace String
     bool   IsNullOrEmpty(const utf8 * str);
     sint32 Compare(const std::string &a, const std::string &b, bool ignoreCase = false);
     sint32 Compare(const utf8 * a, const utf8 * b, bool ignoreCase = false);
-    bool Equals(const std::string &a, const std::string &b, bool ignoreCase = false);
+    bool   Equals(const std::string &a, const std::string &b, bool ignoreCase = false);
     bool   Equals(const utf8 * a, const utf8 * b, bool ignoreCase = false);
     bool   StartsWith(const utf8 * str, const utf8 * match, bool ignoreCase = false);
     size_t LastIndexOf(const utf8 * str, utf8 match);
diff --git a/src/openrct2/network/NetworkAction.h b/src/openrct2/network/NetworkAction.h
index 3e672bc57d..6e0ca27136 100644
--- a/src/openrct2/network/NetworkAction.h
+++ b/src/openrct2/network/NetworkAction.h
@@ -25,7 +25,7 @@ class NetworkAction final
 public:
     rct_string_id       Name;
     std::string         PermissionName;
-    std::vector<sint32>    Commands;
+    std::vector<sint32> Commands;
 };
 
 class NetworkActions final