Searching, Sorting, Minor Refactor