dto refactoring
engineer refactoring