2. Add Transaciton Id to DTO. Basic refactoring/commenting