refactor dao, service and ...
refactor