flow: minor api polishing

Change-Id: Ib9086b1d4ece2c351a4013707cf936795870e379