diff --git a/radio/Symbolizer.cpp b/radio/Symbolizer.cpp
index 3a9d5da..c20ecb4 100644
--- a/radio/Symbolizer.cpp
+++ b/radio/Symbolizer.cpp
@@ -19,12 +19,7 @@ void Symbolizer::setNumBitsPerSymbol(uint32_t nBitsPerSym)
 	m_symbolBitCount = 0;
 	m_nBitsPerSym = nBitsPerSym;
 	m_lastSymbol = 0;
-	m_symbolMask = 0;
-	for(uint32_t k=0; k < nBitsPerSym; k++)
-	{
-		m_symbolMask <<= 1;
-		m_symbolMask |= 1;
-	}
+	m_symbolMask = symbol_t(1 << m_nBitsPerSym) - 1;
 }
 
 void Symbolizer::commit(symbol_t sym)
@@ -41,7 +36,7 @@ void Symbolizer::assemble_and_commit(uint8_t data)
 	for (size_t i=0; i < SIZEOF_DATA_BITS; i++)
 	{
 		sym <<= 1;
-		sym |= (symbol_t)((data >> (SIZEOF_DATA_BITS-1) & 1) != 0);
+		sym |= (symbol_t)(data >> (SIZEOF_DATA_BITS-1) & 1);
 		data <<= 1;
 		m_symbolBitCount++;
 		if (m_symbolBitCount == m_nBitsPerSym)