refactoring, removing unused code, creating keyword search