[Common] Minor code cleanup
[Client] New path finding implementation