diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/keelmodule.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/keelmodule.hpp
index da976b3e..3258f94b 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/keelmodule.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/keelmodule.hpp
@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const keel::Module *keelModule() noexcept;
+keel::Module const *keelModule() noexcept;
 
 }
diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/studiomodule.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/studiomodule.hpp
index c950021d..024d07e0 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/studiomodule.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/studiomodule.hpp
@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const studio::Module *studioModule() noexcept;
+studio::Module const *studioModule() noexcept;
 
 }
diff --git a/src/nostalgia/modules/sound/include/nostalgia/sound/keelmodule.hpp b/src/nostalgia/modules/sound/include/nostalgia/sound/keelmodule.hpp
index 197e1f3f..22dd532f 100644
--- a/src/nostalgia/modules/sound/include/nostalgia/sound/keelmodule.hpp
+++ b/src/nostalgia/modules/sound/include/nostalgia/sound/keelmodule.hpp
@@ -8,6 +8,6 @@
 
 namespace nostalgia::sound {
 
-const keel::Module *keelModule() noexcept;
+keel::Module const *keelModule() noexcept;
 
 }
diff --git a/src/nostalgia/modules/sound/include/nostalgia/sound/studiomodule.hpp b/src/nostalgia/modules/sound/include/nostalgia/sound/studiomodule.hpp
index f7e68e1f..c807372d 100644
--- a/src/nostalgia/modules/sound/include/nostalgia/sound/studiomodule.hpp
+++ b/src/nostalgia/modules/sound/include/nostalgia/sound/studiomodule.hpp
@@ -8,6 +8,6 @@
 
 namespace nostalgia::sound {
 
-const studio::Module *studioModule() noexcept;
+studio::Module const *studioModule() noexcept;
 
 }
diff --git a/src/nostalgia/modules/sound/src/keel/keelmodule.cpp b/src/nostalgia/modules/sound/src/keel/keelmodule.cpp
index c703ec67..bd663c87 100644
--- a/src/nostalgia/modules/sound/src/keel/keelmodule.cpp
+++ b/src/nostalgia/modules/sound/src/keel/keelmodule.cpp
@@ -10,32 +10,30 @@
 
 namespace nostalgia::sound {
 
-static class: public keel::Module {
-	private:
+static struct: keel::Module {
 
-	public:
-		[[nodiscard]]
-		ox::String id() const noexcept override {
-			return ox::String{"net.drinkingtea.nostalgia.sound"};
-		}
+	[[nodiscard]]
+	ox::String id() const noexcept override {
+		return ox::String{"net.drinkingtea.nostalgia.sound"};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
+		return {
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::Converter> converters() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::Converter> converters() const noexcept final {
+		return {
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
+		return {
+		};
+	}
 
 } const mod;
 
diff --git a/src/nostalgia/modules/sound/src/studio/studiomodule.cpp b/src/nostalgia/modules/sound/src/studio/studiomodule.cpp
index 0a2369df..0806dfe0 100644
--- a/src/nostalgia/modules/sound/src/studio/studiomodule.cpp
+++ b/src/nostalgia/modules/sound/src/studio/studiomodule.cpp
@@ -8,7 +8,8 @@
 
 namespace nostalgia::sound {
 
-static class: public studio::Module {
+static struct: studio::Module {
+
 	ox::Vector<studio::EditorMaker> editors(studio::Context&) const noexcept final {
 		return {
 		};
@@ -18,6 +19,7 @@ static class: public studio::Module {
 		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		return out;
 	}
+
 } const mod;
 
 const studio::Module *studioModule() noexcept {
diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp
index 0efad3d3..aeddbed6 100644
--- a/src/nostalgia/player/app.cpp
+++ b/src/nostalgia/player/app.cpp
@@ -52,7 +52,7 @@ static int testUpdateHandler(turbine::Context &tctx) noexcept {
 }
 
 [[maybe_unused]]
-static void testKeyEventHandler(turbine::Context &tctx, turbine::Key key, bool down) noexcept {
+static void testKeyEventHandler(turbine::Context &tctx, turbine::Key const key, bool const down) noexcept {
 	if (down) {
 		if (key == turbine::Key::Alpha_Q) {
 			turbine::requestShutdown(tctx);