Update from code review

Signed-off-by: Ryan Chen <ryan.chen@turn.com>