Changed according to code review
Signed-off-by: Janet Jin <janet.jin@turn.com>