Refactoring payment code
Remove unnecessary vals in for comprehension