Refactor use :eq instead of find method