refactor dao. Test ok.
refactor