Refactor unsafe
blocks; update TODO comments
#432
Merged
unsafe
blocks; update TODO comments
#432