Refactoring
No need for quick-search. Delete