Use let else instead of is_none & unwrap, get entitity directly instead of iterating for it. (#122)

* Use let else instead of is_none & unwrap, don't iterate to find entity just get it directly.

* Cargo fmt