diff --git a/src/org/forkalsrud/album/web/AlbumServlet.java b/src/org/forkalsrud/album/web/AlbumServlet.java
index 618eb9e..3263b7b 100644
--- a/src/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/org/forkalsrud/album/web/AlbumServlet.java
@@ -120,8 +120,8 @@ public class AlbumServlet
         Dimension orig = entry.getSize();
         Dimension outd = orig.scaled(size);
 
-        Iterator readers = ImageIO.getImageReadersByFormatName("jpg");
-        ImageReader reader = (ImageReader)readers.next();
+        Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName("jpg");
+        ImageReader reader = readers.next();
         ImageInputStream iis = ImageIO.createImageInputStream(file);
         reader.setInput(iis, true);
         ImageReadParam param = reader.getDefaultReadParam();
@@ -153,8 +153,8 @@ public class AlbumServlet
         g2.transform(xform);
         g2.drawImage(img, 0, 0, null);
 
-        Iterator writers = ImageIO.getImageWritersByFormatName("jpg");
-        ImageWriter writer = (ImageWriter)writers.next();
+        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
+        ImageWriter writer = writers.next();
         ImageOutputStream ios = ImageIO.createImageOutputStream(res.getOutputStream());
         writer.setOutput(ios);
         writer.write(buf2);