Refactoring. Working on search functionality.