improve - use rpc option parameter for executor
fix - code style