Sync local: Refactor to avoid unwrap()
#110
+84
−56
Merged
unwrap()
#110