Cleaned up the Edge class