Refactoring and started on searching