refactoring dao's and editing dao services