Clean up white space.
Add property for identifying city in group payment.