Code cleanup.
Fix searching.