diff --git a/modemm17/M17Demodulator.h b/modemm17/M17Demodulator.h
index ba50c4ebf..f7e97d0b1 100644
--- a/modemm17/M17Demodulator.h
+++ b/modemm17/M17Demodulator.h
@@ -27,14 +27,8 @@ struct MODEMM17_API M17Demodulator
 	static const uint16_t SYMBOL_RATE = 4800;
 	static const uint16_t SAMPLES_PER_SYMBOL = SAMPLE_RATE / SYMBOL_RATE;
 	static const uint16_t BLOCK_SIZE = 192;
-
-	static constexpr float sample_rate = SAMPLE_RATE;
-	static constexpr float symbol_rate = SYMBOL_RATE;
-
 	static const uint8_t MAX_MISSING_SYNC = 8;
 
-	using collelator_t = Correlator;
-	using sync_word_t = SyncWord;
 	using callback_t = M17FrameDecoder::callback_t;
 	using diagnostic_callback_t = std::function<void(bool, float, float, float, int, int, float, int, int, int, int)>;
 
@@ -50,9 +44,9 @@ struct MODEMM17_API M17Demodulator
 	DataCarrierDetect<SAMPLE_RATE, 500> dcd{2500, 4000, 1.0, 4.0};
 	ClockRecovery clock_recovery;
 
-	sync_word_t preamble_sync{{+3, -3, +3, -3, +3, -3, +3, -3}, 29.f};
-	sync_word_t lsf_sync{     {+3, +3, +3, +3, -3, -3, +3, -3}, 32.f, -31.f};	// LSF or STREAM (inverted)
-	sync_word_t packet_sync{  {+3, -3, +3, +3, -3, -3, -3, -3}, 31.f, -31.f};	// PACKET or BERT (inverted)
+	SyncWord preamble_sync{{+3, -3, +3, -3, +3, -3, +3, -3}, 29.f};
+	SyncWord lsf_sync{     {+3, +3, +3, +3, -3, -3, +3, -3}, 32.f, -31.f};	// LSF or STREAM (inverted)
+	SyncWord packet_sync{  {+3, -3, +3, +3, -3, -3, -3, -3}, 31.f, -31.f};	// PACKET or BERT (inverted)
 
 	FreqDevEstimator dev;
 	float idev;
@@ -117,7 +111,7 @@ struct MODEMM17_API M17Demodulator
 private:
     static const std::array<float, 150> rrc_taps;
     BaseFirFilter<rrc_taps.size()> demod_filter{rrc_taps};
-  	collelator_t correlator;
+  	Correlator correlator;
     int16_t initializing_count_;
 };
 
diff --git a/modemm17/M17FrameDecoder.h b/modemm17/M17FrameDecoder.h
index 31d4f78b4..108d1ed49 100644
--- a/modemm17/M17FrameDecoder.h
+++ b/modemm17/M17FrameDecoder.h
@@ -39,7 +39,7 @@ QString dump(const std::array<C,N>& data, char header = 'D')
 
 struct M17FrameDecoder
 {
-    static constexpr size_t MAX_LICH_FRAGMENT = 5;
+    static const size_t MAX_LICH_FRAGMENT = 5;
 
     M17Randomizer<368> derandomize_;
     PolynomialInterleaver<45, 92, 368> interleaver_;
diff --git a/modemm17/M17Framer.h b/modemm17/M17Framer.h
index 3b6e21c1c..f632221f2 100644
--- a/modemm17/M17Framer.h
+++ b/modemm17/M17Framer.h
@@ -13,11 +13,6 @@ namespace modemm17
 template <size_t N = 368>
 struct M17Framer
 {
-    using buffer_t = std::array<int8_t, N>;
-
-    alignas(16) buffer_t buffer_;
-    size_t index_ = 0;
-
     M17Framer()
     {
         reset();
@@ -57,6 +52,10 @@ struct M17Framer
         buffer_.fill(0);
         index_ = 0;
     }
+
+private:
+    alignas(16) std::array<int8_t, N> buffer_;
+    size_t index_ = 0;
 };
 
 } // modemm17