diff --git a/Aufgabe3/ConsoleApplication1/Buffer.cs b/Aufgabe3/ConsoleApplication1/Buffer.cs
index bdae2616f7c92e91d34f0cf8990dd416d4ec55b5..dd61b6e59bae918be9bc7512b1820cc14b7ec169 100644
--- a/Aufgabe3/ConsoleApplication1/Buffer.cs
+++ b/Aufgabe3/ConsoleApplication1/Buffer.cs
@@ -12,63 +12,56 @@ namespace ConsoleApplication1
     
     public class Buffer
     {
-        private Queue<Car> carQueue;
-        private int size = 10;
-        private Mutex mutex;
+        private Queue<Car> _carQueue;
+        private int _size = 10;
+        private Mutex _mutex;
 
+        // Constructor initialized with a Mutex and a Queue.
         public Buffer()
         {
-            mutex = new Mutex();
-            carQueue = new Queue<Car>();
+            _mutex = new Mutex();
+            _carQueue = new Queue<Car>();
         }
 
-        public void push(Car c)
+        // This function adds a Car Object into the Queue.
+        public void Push(Car c)
         {
-            if (carQueue.Count == size)
+            // Check whether the Queue is full and throws an Exception if so.
+            if (_carQueue.Count == _size)
             {
                 throw new Exception("Buffer full");
-            }
-            
+            }  
             
-            carQueue.Enqueue(c);
+            _carQueue.Enqueue(c);
         }
 
-        public Car pop()
+        // Removes a Car Object from the Queue and returns the Queue.
+        public Car Pop()
         {
-            if (carQueue.Count == 0)
+            if (_carQueue.Count == 0)
             {
                 throw new Exception("Buffer empty");
             }
 
-            return carQueue.Dequeue();
+            return _carQueue.Dequeue();
         }
 
-        public bool full()
+        // Check if the Queue is full.
+        public bool Full()
         {
-            bool isFull = false;
-            if (carQueue.Count == size)
-            {
-                isFull = true;
-            }
-
-            return isFull;
+            return _carQueue.Count == _size;
         }
 
-        public bool empty()
+        // Check if the Queue is empty.
+        public bool Empty()
         {
-            if (carQueue.Count == 0)
-            {
-                return true;
-            }
-
-            return false;
+            return _carQueue.Count == 0;
         }
 
-        public Mutex getMutex()
+        // returns the Mutex. 
+        public Mutex GetMutex()
         {
-            return this.mutex;
+            return this._mutex;
         }
-
-
     }
 }