Payment formatting tweaks mainly