diff --git a/libpsk/include/psk/control_chars.hpp b/libpsk/include/psk/control_chars.hpp
index ad541ce..37c2d45 100644
--- a/libpsk/include/psk/control_chars.hpp
+++ b/libpsk/include/psk/control_chars.hpp
@@ -12,6 +12,7 @@
 namespace ham {
 namespace psk {
 
+// Special control codes
 namespace ctrl_chars {
 enum ctrl_chars	: short
 {
@@ -21,6 +22,10 @@ enum ctrl_chars	: short
 };
 }
 
+// Definition of the character type
+typedef short txchar_type;
+
+
 }}
 
 
diff --git a/libpsk/include/psk/modulator.hpp b/libpsk/include/psk/modulator.hpp
index 50cd1a5..122e9b8 100644
--- a/libpsk/include/psk/modulator.hpp
+++ b/libpsk/include/psk/modulator.hpp
@@ -90,10 +90,10 @@ private:
 	mode m_mode { mode::bpsk };
 	double m_t {};
 	double m_psk_phase_inc;
-	double (* m_p_psk_tx_i)( double, double) {};
+	double (*m_p_psk_tx_i)( double, double) {};
 	double (*m_p_psk_tx_q )( double, double ) {};
-	double *tmp_i;
-	double *tmp_q;
+	double *tmp_i;	//TODO: Temporary remove later
+	double *tmp_q;	//TODO: Temporary remove later
 	int m_ramp {};
 	double m_psk_sec_per_samp {};
 	double m_psk_time {};
diff --git a/libpsk/src/modulator.cpp b/libpsk/src/modulator.cpp
index 10b124b..7c81297 100644
--- a/libpsk/src/modulator.cpp
+++ b/libpsk/src/modulator.cpp
@@ -278,6 +278,7 @@ void modulator::put_tx( short txchar )
 {
 	constexpr char BACK_SPACE_CODE = 0x08;
 	//EnterCriticalSection(&m_CriticalSection);
+//TODO: Add special control chars later
 #if 0
 	if( cntrl )	//is a tx control code
 	{
diff --git a/psk31test.cpp b/psk31test.cpp
index a879137..0f25e7d 100644
--- a/psk31test.cpp
+++ b/psk31test.cpp
@@ -112,9 +112,6 @@ namespace
 
 }
 
-
-
-
 int decoder_main( const char *filename )
 {