refactoring and search development