Removed nasty goto. A* improvement