TONY: Reduce the scope of some variables, change the return type of findPath()