diff --git a/src/org/apollo/game/command/CommandDispatcher.java b/src/org/apollo/game/command/CommandDispatcher.java
index 72302abc..be774010 100644
--- a/src/org/apollo/game/command/CommandDispatcher.java
+++ b/src/org/apollo/game/command/CommandDispatcher.java
@@ -15,7 +15,7 @@ public final class CommandDispatcher {
 	/**
 	 * A map of command strings to command listeners.
 	 */
-	private final Map<String, CommandListener> listeners = new HashMap<String, CommandListener>();
+	private final Map<String, CommandListener> listeners = new HashMap<>();
 
 	/**
 	 * Creates the command dispatcher and registers a listener for the credits command.
diff --git a/src/org/apollo/game/model/def/EquipmentDefinition.java b/src/org/apollo/game/model/def/EquipmentDefinition.java
index 16a16914..92e08966 100644
--- a/src/org/apollo/game/model/def/EquipmentDefinition.java
+++ b/src/org/apollo/game/model/def/EquipmentDefinition.java
@@ -16,7 +16,7 @@ public final class EquipmentDefinition {
 	/**
 	 * The equipment definitions.
 	 */
-	private static final Map<Integer, EquipmentDefinition> definitions = new HashMap<Integer, EquipmentDefinition>();
+	private static final Map<Integer, EquipmentDefinition> definitions = new HashMap<>();
 
 	/**
 	 * Initialises the equipment definitions.
diff --git a/src/org/apollo/game/model/inv/Inventory.java b/src/org/apollo/game/model/inv/Inventory.java
index 623f0854..e8d60b67 100644
--- a/src/org/apollo/game/model/inv/Inventory.java
+++ b/src/org/apollo/game/model/inv/Inventory.java
@@ -406,11 +406,10 @@ public final class Inventory implements Cloneable {
 					if (amount >= item.getAmount()) {
 						set(slot, null);
 						return item.getAmount();
-					} else {
-						int newAmount = item.getAmount() - amount;
-						set(slot, new Item(item.getId(), newAmount));
-						return amount;
 					}
+					int newAmount = item.getAmount() - amount;
+					set(slot, new Item(item.getId(), newAmount));
+					return amount;
 				}
 			}
 			return 0;
diff --git a/src/org/apollo/io/MessageHandlerChainParser.java b/src/org/apollo/io/MessageHandlerChainParser.java
index 49f3bbe9..993b0ad9 100644
--- a/src/org/apollo/io/MessageHandlerChainParser.java
+++ b/src/org/apollo/io/MessageHandlerChainParser.java
@@ -82,7 +82,7 @@ public final class MessageHandlerChainParser {
 			}
 
 			Class<? extends Message> messageClass = (Class<? extends Message>) Class.forName(messageClassName);
-			List<MessageHandler<?>> handlers = new ArrayList<MessageHandler<?>>();
+			List<MessageHandler<?>> handlers = new ArrayList<>();
 
 			for (XmlNode handlerNode : chainNode) {
 				if (!handlerNode.getName().equals("handler")) {
diff --git a/src/org/apollo/net/codec/game/GamePacketEncoder.java b/src/org/apollo/net/codec/game/GamePacketEncoder.java
index c13cc85b..528c81e6 100644
--- a/src/org/apollo/net/codec/game/GamePacketEncoder.java
+++ b/src/org/apollo/net/codec/game/GamePacketEncoder.java
@@ -33,8 +33,7 @@ public final class GamePacketEncoder extends MessageToMessageEncoder<GamePacket>
 	}
 
 	@Override
-	protected void encode(ChannelHandlerContext ctx, GamePacket msg, List<Object> out) throws Exception {
-		GamePacket packet = (GamePacket) msg;
+	protected void encode(ChannelHandlerContext ctx, GamePacket packet, List<Object> out) throws Exception {
 		PacketType type = packet.getType();
 		int headerLength = 1;
 		int payloadLength = packet.getLength();
diff --git a/src/org/apollo/net/codec/game/GamePacketReader.java b/src/org/apollo/net/codec/game/GamePacketReader.java
index 08aaa2b1..e75dce8e 100644
--- a/src/org/apollo/net/codec/game/GamePacketReader.java
+++ b/src/org/apollo/net/codec/game/GamePacketReader.java
@@ -312,9 +312,8 @@ public final class GamePacketReader {
 		int peek = buffer.getByte(buffer.readerIndex());
 		if (peek < 128) {
 			return buffer.readByte() - 64;
-		} else {
-			return buffer.readShort() - 49152;
 		}
+		return buffer.readShort() - 49152;
 	}
 
 	/**
@@ -394,9 +393,8 @@ public final class GamePacketReader {
 		int peek = buffer.getByte(buffer.readerIndex());
 		if (peek < 128) {
 			return buffer.readByte();
-		} else {
-			return buffer.readShort() - 32768;
 		}
+		return buffer.readShort() - 32768;
 	}
 
 	/**
diff --git a/src/org/apollo/tools/EquipmentUpdater.java b/src/org/apollo/tools/EquipmentUpdater.java
index e97ca392..2d1156af 100644
--- a/src/org/apollo/tools/EquipmentUpdater.java
+++ b/src/org/apollo/tools/EquipmentUpdater.java
@@ -941,9 +941,8 @@ public final class EquipmentUpdater {
 		}
 		if (name.equals("Mithril arrow")) {
 			return 1;
-		} else {
-			return 1;
 		}
+		return 1;
 	}
 
 	/**
diff --git a/src/org/apollo/tools/NoteUpdater.java b/src/org/apollo/tools/NoteUpdater.java
index 038df90d..c5fb7c2e 100644
--- a/src/org/apollo/tools/NoteUpdater.java
+++ b/src/org/apollo/tools/NoteUpdater.java
@@ -38,7 +38,7 @@ public final class NoteUpdater {
 			ItemDefinition.init(defs);
 
 			os.writeShort(defs.length);
-			Map<Integer, Integer> itemToNote = new HashMap<Integer, Integer>();
+			Map<Integer, Integer> itemToNote = new HashMap<>();
 
 			for (int id = 0; id < defs.length; id++) {
 				ItemDefinition def = ItemDefinition.lookup(id);
diff --git a/src/org/apollo/update/UpdateDispatcher.java b/src/org/apollo/update/UpdateDispatcher.java
index f2bdc819..b5a27fca 100644
--- a/src/org/apollo/update/UpdateDispatcher.java
+++ b/src/org/apollo/update/UpdateDispatcher.java
@@ -25,17 +25,17 @@ public final class UpdateDispatcher {
 	/**
 	 * A queue for pending HTTP requests.
 	 */
-	private final BlockingQueue<ChannelRequest<HttpRequest>> httpQueue = new LinkedBlockingQueue<ChannelRequest<HttpRequest>>();
+	private final BlockingQueue<ChannelRequest<HttpRequest>> httpQueue = new LinkedBlockingQueue<>();
 
 	/**
 	 * A queue for pending JAGGRAB requests.
 	 */
-	private final BlockingQueue<ChannelRequest<JagGrabRequest>> jagGrabQueue = new LinkedBlockingQueue<ChannelRequest<JagGrabRequest>>();
+	private final BlockingQueue<ChannelRequest<JagGrabRequest>> jagGrabQueue = new LinkedBlockingQueue<>();
 
 	/**
 	 * A queue for pending 'on-demand' requests.
 	 */
-	private final BlockingQueue<ChannelRequest<OnDemandRequest>> onDemandQueue = new PriorityBlockingQueue<ChannelRequest<OnDemandRequest>>();
+	private final BlockingQueue<ChannelRequest<OnDemandRequest>> onDemandQueue = new PriorityBlockingQueue<>();
 
 	/**
 	 * Dispatches a HTTP request.
diff --git a/src/org/apollo/update/UpdateService.java b/src/org/apollo/update/UpdateService.java
index 18fc2e52..47bc5b56 100644
--- a/src/org/apollo/update/UpdateService.java
+++ b/src/org/apollo/update/UpdateService.java
@@ -40,7 +40,7 @@ public final class UpdateService extends Service {
 	/**
 	 * A list of request workers.
 	 */
-	private final List<RequestWorker<?, ?>> workers = new ArrayList<RequestWorker<?, ?>>();
+	private final List<RequestWorker<?, ?>> workers = new ArrayList<>();
 
 	/**
 	 * Creates the update service.
diff --git a/src/org/apollo/util/TextUtil.java b/src/org/apollo/util/TextUtil.java
index 0fce4aff..a46cb24c 100644
--- a/src/org/apollo/util/TextUtil.java
+++ b/src/org/apollo/util/TextUtil.java
@@ -104,7 +104,7 @@ public final class TextUtil {
 		for (char c : str.toLowerCase().toCharArray()) {
 			for (char validChar : FREQUENCY_ORDERED_CHARS) {
 				if (c == validChar) {
-					builder.append((char) c);
+					builder.append(c);
 					break;
 				}
 			}
diff --git a/src/org/apollo/util/plugin/PluginManager.java b/src/org/apollo/util/plugin/PluginManager.java
index 8af87a75..a5e3cff3 100644
--- a/src/org/apollo/util/plugin/PluginManager.java
+++ b/src/org/apollo/util/plugin/PluginManager.java
@@ -51,7 +51,7 @@ public final class PluginManager {
 	 * @return The plugin map.
 	 */
 	private Map<String, PluginMetaData> createMap(Collection<PluginMetaData> plugins) {
-		Map<String, PluginMetaData> map = new HashMap<String, PluginMetaData>();
+		Map<String, PluginMetaData> map = new HashMap<>();
 		for (PluginMetaData plugin : plugins) {
 			map.put(plugin.getId(), plugin);
 		}
diff --git a/src/org/apollo/util/xml/XmlNode.java b/src/org/apollo/util/xml/XmlNode.java
index c714c62f..92f6effb 100644
--- a/src/org/apollo/util/xml/XmlNode.java
+++ b/src/org/apollo/util/xml/XmlNode.java
@@ -20,7 +20,7 @@ public final class XmlNode implements Iterable<XmlNode> {
 	/**
 	 * The attribute map.
 	 */
-	private final Map<String, String> attributes = new HashMap<String, String>();
+	private final Map<String, String> attributes = new HashMap<>();
 
 	/**
 	 * The list of child nodes.