Refactoring from CodeClimate: Search Edition