Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Sofien <2a71bed3656a5618790c44e9b15ad410fa8ec6e9@users.noreply.github.com>
botify-labs/simpleflow,botify-labs/simpleflow