#update - cleaner unwrap optional

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