clean code and (fix search by in process )