fix some cosmetic glitches in the codebase

- rename URL into URI in paymentserver
- remove several new-lines
- remove unneeded spaces
- indentation fixes