diff --git a/lib/ts_stream.cpp b/lib/ts_stream.cpp
index b8bf156e..4c41226b 100644
--- a/lib/ts_stream.cpp
+++ b/lib/ts_stream.cpp
@@ -122,7 +122,7 @@ namespace TS{
   void Stream::finish(){
     if (!pesStreams.size()){return;}
 
-    for (std::map<unsigned long, std::deque<Packet>>::const_iterator i = pesStreams.begin();
+    for (std::map<unsigned long, std::deque<Packet> >::const_iterator i = pesStreams.begin();
          i != pesStreams.end(); i++){
       parsePES(i->first, true);
     }
@@ -191,7 +191,7 @@ namespace TS{
     // Handle PMT packets
     if (pmtTracks.count(tid)){
       ///\todo Keep track of updates in PMT instead of keeping only the last PMT per program as a
-      ///reference
+      /// reference
       if (threaded){globalSem.wait();}
       mappingTable[tid] = trackPackets.back();
       lastPMT[tid] = Util::bootSecs();
@@ -318,7 +318,8 @@ namespace TS{
     }
 
     if (outPackets.size()){
-      for (std::map<unsigned long, std::deque<DTSC::Packet>>::const_iterator i = outPackets.begin();
+      for (std::map<unsigned long, std::deque<DTSC::Packet> >::const_iterator i =
+               outPackets.begin();
            i != outPackets.end(); i++){
         if (i->second.size()){
           if (threaded){globalSem.post();}
@@ -327,7 +328,7 @@ namespace TS{
       }
     }
 
-    for (std::map<unsigned long, std::deque<Packet>>::const_iterator i = pesStreams.begin();
+    for (std::map<unsigned long, std::deque<Packet> >::const_iterator i = pesStreams.begin();
          i != pesStreams.end(); i++){
       std::deque<Packet>::const_iterator curPack = i->second.begin();
 
@@ -804,7 +805,7 @@ namespace TS{
     unsigned long packTime = 0xFFFFFFFFull;
     unsigned long packTrack = 0;
 
-    for (std::map<unsigned long, std::deque<DTSC::Packet>>::iterator it = outPackets.begin();
+    for (std::map<unsigned long, std::deque<DTSC::Packet> >::iterator it = outPackets.begin();
          it != outPackets.end(); it++){
       if (it->second.front().getTime() < packTime){
         packTrack = it->first;
diff --git a/lib/ts_stream.h b/lib/ts_stream.h
index 46cb92a4..fc99b70d 100644
--- a/lib/ts_stream.h
+++ b/lib/ts_stream.h
@@ -68,9 +68,9 @@ namespace TS{
     std::map<unsigned long, unsigned long long> lastPMT;
     std::map<unsigned long, ProgramMappingTable> mappingTable;
 
-    std::map<unsigned long, std::deque<Packet>> pesStreams;
-    std::map<unsigned long, std::deque<unsigned long long>> pesPositions;
-    std::map<unsigned long, std::deque<DTSC::Packet>> outPackets;
+    std::map<unsigned long, std::deque<Packet> > pesStreams;
+    std::map<unsigned long, std::deque<unsigned long long> > pesPositions;
+    std::map<unsigned long, std::deque<DTSC::Packet> > outPackets;
     std::map<unsigned long, DTSC::Packet> buildPacket;
     std::map<unsigned long, unsigned long> pidToCodec;
     std::map<unsigned long, aac::adts> adtsInfo;