#12 Refactor methods in DtoFactoryService