diff --git a/event-queue/README.md b/event-queue/README.md
index 2129f8c69..35fdac45c 100644
--- a/event-queue/README.md
+++ b/event-queue/README.md
@@ -26,4 +26,4 @@ Use the Event Queue pattern when
 
 ## Credits
 
-* [Mihály Kuprivecz - Event Queue]
+* [Mihaly Kuprivecz - Event Queue] (http://gameprogrammingpatterns.com/event-queue.html)
diff --git a/event-queue/model.ucls b/event-queue/etc/model.ucls
similarity index 100%
rename from event-queue/model.ucls
rename to event-queue/etc/model.ucls
diff --git a/event-queue/model.png b/event-queue/model.png
deleted file mode 100644
index 8222dccbf..000000000
Binary files a/event-queue/model.png and /dev/null differ
diff --git a/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java b/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java
index 7554464dd..f8f1b1e3c 100644
--- a/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java
+++ b/event-queue/src/main/java/com/iluwatar/event/queue/Audio.java
@@ -107,17 +107,15 @@ public class Audio {
     init();
     // Walk the pending requests.
     for (int i = headIndex; i != tailIndex; i = (i + 1) % MAX_PENDING) {
-      if (getPendingAudio()[i].stream == stream) {
+      if (getPendingAudio()[i].getStream() == stream) {
         // Use the larger of the two volumes.
-        getPendingAudio()[i].volume = Math.max(volume, getPendingAudio()[i].volume);
+        getPendingAudio()[i].setVolume(Math.max(volume, getPendingAudio()[i].getVolume()));
 
         // Don't need to enqueue.
         return;
       }
     }
-    getPendingAudio()[tailIndex] = new PlayMessage();
-    getPendingAudio()[tailIndex].stream = stream;
-    getPendingAudio()[tailIndex].volume = volume;
+    getPendingAudio()[tailIndex] = new PlayMessage(stream, volume);
     tailIndex = (tailIndex + 1) % MAX_PENDING;
   }
   
@@ -132,7 +130,7 @@ public class Audio {
     }
     Clip clip = null;
     try {
-      AudioInputStream audioStream = getPendingAudio()[headIndex].stream;
+      AudioInputStream audioStream = getPendingAudio()[headIndex].getStream();
       headIndex++;
       clip = AudioSystem.getClip();
       clip.open(audioStream);
diff --git a/event-queue/src/main/java/com/iluwatar/event/queue/PlayMessage.java b/event-queue/src/main/java/com/iluwatar/event/queue/PlayMessage.java
index 5d151e8d5..5ced2e3b3 100644
--- a/event-queue/src/main/java/com/iluwatar/event/queue/PlayMessage.java
+++ b/event-queue/src/main/java/com/iluwatar/event/queue/PlayMessage.java
@@ -31,6 +31,29 @@ import javax.sound.sampled.AudioInputStream;
  *
  */
 public class PlayMessage {
-  AudioInputStream stream;
-  float volume;
+  
+  private AudioInputStream stream;
+  
+  private float volume;
+  
+  public PlayMessage(AudioInputStream stream, float volume) {
+    setStream(stream);
+    setVolume(volume);
+  }
+
+  public AudioInputStream getStream() {
+    return stream;
+  }
+
+  private void setStream(AudioInputStream stream) {
+    this.stream = stream;
+  }
+
+  public float getVolume() {
+    return volume;
+  }
+
+  public void setVolume(float volume) {
+    this.volume = volume;
+  }
 }