minor code format fix in rpc-related files