#update - refactor

Signed-off-by: Ryne Cheow <rynecheow@gmail.com>