Simplifying Search

> Shortened the code