diff --git a/include/SafeQueue.h b/include/SafeQueue.h
index 2492776..7ae4fca 100644
--- a/include/SafeQueue.h
+++ b/include/SafeQueue.h
@@ -3,9 +3,11 @@
 #include <mutex>
 #include <queue>
 
-// Thread safe implementation of a Queue using a std::queue
+
+// Thread safe implementation of a Queue using an std::queue
 template <typename T>
-class SafeQueue {
+class SafeQueue 
+{
 private:
   std::queue<T> m_queue;
   std::mutex m_mutex;
@@ -24,22 +26,22 @@ class SafeQueue {
 
 
   bool empty() {
-    std::unique_lock<std::mutex> lock(m_mutex);
+    std::lock_guard <std::mutex> lock(m_mutex);
     return m_queue.empty();
   }
   
   int size() {
-    std::unique_lock<std::mutex> lock(m_mutex);
+    std::lock_guard <std::mutex> lock(m_mutex);
     return m_queue.size();
   }
 
   void enqueue(T& t) {
-    std::unique_lock<std::mutex> lock(m_mutex);
+    std::lock_guard <std::mutex> lock(m_mutex);
     m_queue.push(t);
   }
   
   bool dequeue(T& t) {
-    std::unique_lock<std::mutex> lock(m_mutex);
+    std::lock_guard <std::mutex> lock(m_mutex);
 
     if (m_queue.empty()) {
       return false;