avoid find_by
cls
code refactor