diff --git a/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java b/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java
index 4ea0306..823f5f5 100644
--- a/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java
+++ b/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java
@@ -44,9 +44,9 @@ import java.util.HashSet;
 final class RawInputEventQueue {
 	private final Object monitor = new Object();
 
-	private List devices;
+	private List<RawDevice> devices;
 	
-	public final void start(List devices) throws IOException {
+	public final void start(List<RawDevice> devices) throws IOException {
 		this.devices = devices;
 		QueueThread queue = new QueueThread();
 		synchronized (monitor) {
@@ -64,7 +64,7 @@ final class RawInputEventQueue {
 
 	private final RawDevice lookupDevice(long handle) {
 		for (int i = 0; i < devices.size(); i++) {
-			RawDevice device = (RawDevice)devices.get(i);
+			RawDevice device = devices.get(i);
 			if (device.getHandle() == handle)
 				return device;
 		}
@@ -126,10 +126,10 @@ final class RawInputEventQueue {
 			}
 			if (exception != null)
 				return;
-			Set active_infos = new HashSet();
+			Set<RawDeviceInfo> active_infos = new HashSet<>();
 			try {
 				for (int i = 0; i < devices.size(); i++) {
-					RawDevice device = (RawDevice)devices.get(i);
+					RawDevice device = devices.get(i);
 					active_infos.add(device.getInfo());
 				}
 				RawDeviceInfo[] active_infos_array = new RawDeviceInfo[active_infos.size()];