cleanuped dto code