commit message and rpc point refactoring