diff --git a/src/ei/engine/math/Vector2f.java b/src/ei/engine/math/Vector2f.java
index 6b7d75d..598e7cd 100644
--- a/src/ei/engine/math/Vector2f.java
+++ b/src/ei/engine/math/Vector2f.java
@@ -6,7 +6,7 @@ package ei.engine.math;
  * @author Ziver
  */
 
-public class Vector2f implements Comparable{
+public class Vector2f implements Comparable<Vector2f>{
 	private float x;
 	private float y;
 	
@@ -79,10 +79,10 @@ public class Vector2f implements Comparable{
 	}
 	
 
-	public int compareTo(Object v) {
-		if(x+y > ((Vector2f) v).getX()+((Vector2f) v).getY())
+	public int compareTo(Vector2f v) {
+		if(x+y > v.getX()+v.getY())
 			return 1;
-		else if(x+y < ((Vector2f) v).getX()+((Vector2f) v).getY())
+		else if(x+y < v.getX()+v.getY())
 			return -1;
 		else
 			return 0;
diff --git a/src/ei/engine/math/Vector2i.java b/src/ei/engine/math/Vector2i.java
index 60e5435..2a441b2 100644
--- a/src/ei/engine/math/Vector2i.java
+++ b/src/ei/engine/math/Vector2i.java
@@ -6,7 +6,7 @@ package ei.engine.math;
  * @author Ziver
  */
 
-public class Vector2i implements Comparable{
+public class Vector2i implements Comparable<Vector2i>{
 	private int x;
 	private int y;
 	
@@ -76,10 +76,10 @@ public class Vector2i implements Comparable{
 		return "Vector2i["+x+","+y+"]";
 	}
 
-	public int compareTo(Object v) {
-		if(x+y > ((Vector2i) v).getX()+((Vector2i) v).getY())
+	public int compareTo(Vector2i v) {
+		if(x+y > v.getX()+v.getY())
 			return 1;
-		else if(x+y < ((Vector2i) v).getX()+((Vector2i) v).getY())
+		else if(x+y < v.getX()+v.getY())
 			return -1;
 		else
 			return 0;
diff --git a/src/ei/engine/texture/TextureLoader.java b/src/ei/engine/texture/TextureLoader.java
index f5c616a..71db05e 100644
--- a/src/ei/engine/texture/TextureLoader.java
+++ b/src/ei/engine/texture/TextureLoader.java
@@ -91,7 +91,7 @@ public class TextureLoader {
      * @throws IOException Indicates a failure to access the resource
      */
     public Texture getTexture(String resourceName){
-        Texture tex = (Texture) table.get(resourceName);
+        Texture tex = table.get(resourceName);
         
         if (tex != null) {
             return tex;
diff --git a/src/ei/game/algo/AStarPathFinder.java b/src/ei/game/algo/AStarPathFinder.java
index 2c3e8d3..d75da34 100644
--- a/src/ei/game/algo/AStarPathFinder.java
+++ b/src/ei/game/algo/AStarPathFinder.java
@@ -263,7 +263,7 @@ public strictfp class AStarPathFinder implements PathFinder {
 	 * 
 	 * @author Kevin Glass
 	 */
-	private class Step implements Comparable {
+	private class Step implements Comparable<Step> {
 		/** The x position of this step */
 		public int x;
 		/** The y position of this step */
@@ -315,8 +315,8 @@ public strictfp class AStarPathFinder implements PathFinder {
 		/**
 		 * @see java.lang.Comparable#compareTo(java.lang.Object)
 		 */
-		public int compareTo(Object o) {
-			return h - ((Step) o).h;
+		public int compareTo(Step o) {
+			return h - o.h;
 		}
 	}