minor refactor
minor refactor

Summary: changed some variable names and pattern matching slightly. trivial but it made the next diff harder to review/rebase so here you go.

Reviewed By: panagosg7

Differential Revision: D13901748

fbshipit-source-id: 524c9110fe6233c41693ac104e36f3515d96aba5

nmote/flow,nmote/flow,nmote/flow,nmote/flow,nmote/flow,nmote/flow,nmote/flow