Refactor search noise