MOD: refactor client RPC