[dev] Refactor find_peer part