diff --git a/src/main/java/com/syncleus/dann/graph/Edge.java b/src/main/java/com/syncleus/dann/graph/Edge.java
index 4291df272e9d4ec3c11b453f7a7b3a090272469a..2df72ce6d1a325b4e9400a699bdee68e7e56f818 100644
--- a/src/main/java/com/syncleus/dann/graph/Edge.java
+++ b/src/main/java/com/syncleus/dann/graph/Edge.java
@@ -43,12 +43,12 @@ public interface Edge<
 	};
 
 	Set<EP> getEndPoints();
-	Set<EP> getEndPoints(final T node);
-	boolean contains(final T node);
+	Set<EP> getEndPoints(T node);
+	boolean contains(T node);
 	Set<T> getTargets();
-	Set<T> getNeighbors(final T source);
-	Set<T> getTraversableFrom(final T source);
-	Set<T> getTraversableTo(final T destination);
-	boolean isTraversable(final T source, final T destination);
+	Set<T> getNeighbors(T source);
+	Set<T> getTraversableFrom(T source);
+	Set<T> getTraversableTo(T destination);
+	boolean isTraversable(T source, T destination);
 	int getDegree();
 }
diff --git a/src/main/java/com/syncleus/dann/graph/Graph.java b/src/main/java/com/syncleus/dann/graph/Graph.java
index f26c8fcaa99215564231d8e30b8e25245b05d815..b882654ee6c5dc17531f559f5e67d08ae08d029e 100644
--- a/src/main/java/com/syncleus/dann/graph/Graph.java
+++ b/src/main/java/com/syncleus/dann/graph/Graph.java
@@ -45,7 +45,7 @@ public interface Graph<
 {
 	interface Endpoint<
 		ON,
-	  	OE extends Edge<ON,? extends Edge.Endpoint<? extends ON>>,
+	  	OE extends Edge<ON,? extends Edge.Endpoint<ON>>,
 	  	T
 	  > extends Edge.Endpoint<T>
 	{
@@ -64,14 +64,14 @@ public interface Graph<
 
 	interface NodeEndpoint<
 		  ON,
-		  OE extends Edge<ON,? extends Edge.Endpoint<? extends ON>>
+		  OE extends Edge<ON,? extends Edge.Endpoint<ON>>
 	  > extends Graph.Endpoint<ON,OE,ON>
 	{
 	};
 
 	interface EdgeEndpoint<
 		  	ON,
-		  	OE extends Edge<ON,? extends Edge.Endpoint<? extends ON>>
+		  	OE extends Edge<ON,? extends Edge.Endpoint<ON>>
 		> extends Graph.Endpoint<ON,OE,OE>
 	{
 	};
@@ -123,23 +123,23 @@ public interface Graph<
 	 */
 	Set<E> getAdjacentEdges(N node);
 
-	Set<E> getTraversableEdgesFrom(final N source);
-	Set<E> getTraversableEdgesFrom(final E source);
-	Set<E> getTraversableEdgesTo(final N destination);
-	Set<E> getTraversableEdgesTo(final E destination);
+	Set<E> getTraversableEdgesFrom(N source);
+	Set<E> getTraversableEdgesFrom(E source);
+	Set<E> getTraversableEdgesTo(N destination);
+	Set<E> getTraversableEdgesTo(E destination);
 
-	Set<N> getTraversableNodesFrom(final N source);
-	Set<N> getTraversableNodesFrom(final E source);
-	Set<N> getTraversableNodesTo(final N destination);
-	Set<N> getTraversableNodesTo(final E destination);
+	Set<N> getTraversableNodesFrom(N source);
+	Set<N> getTraversableNodesFrom(E source);
+	Set<N> getTraversableNodesTo(N destination);
+	Set<N> getTraversableNodesTo(E destination);
 
-	Set<E> getTraversableAdjacentEdgesFrom(final N source);
-	Set<E> getTraversableAdjacentEdgesFrom(final E source);
-	Set<E> getTraversableAdjacentEdgesTo(final N destination);
-	Set<E> getTraversableAdjacentEdgesTo(final E destination);
+	Set<E> getTraversableAdjacentEdgesFrom(N source);
+	Set<E> getTraversableAdjacentEdgesFrom(E source);
+	Set<E> getTraversableAdjacentEdgesTo(N destination);
+	Set<E> getTraversableAdjacentEdgesTo(E destination);
 
-	Set<N> getTraversableAdjacentNodesFrom(final N source);
-	Set<N> getTraversableAdjacentNodesFrom(final E source);
+	Set<N> getTraversableAdjacentNodesFrom(N source);
+	Set<N> getTraversableAdjacentNodesFrom(E source);
 
 	/**
 	 * Get a list of all reachable nodes adjacent to node. All edges connected to
@@ -154,7 +154,7 @@ public interface Graph<
 	 *         from the spevified node, empty set if the node has no edges.
 	 * @since 2.0
 	 */
-	Set<N> getTraversableAdjacentNodesTo(final N destination);
+	Set<N> getTraversableAdjacentNodesTo(N destination);
 
 	/**
 	 * Get a set of all edges which you can traverse from node. Of course node will
@@ -165,5 +165,5 @@ public interface Graph<
 	 * @return An unmodifiable set of all edges that can be traversed from node.
 	 * @since 2.0
 	 */
-	Set<N> getTraversableAdjacentNodesTo(final E destination);
+	Set<N> getTraversableAdjacentNodesTo(E destination);
 }